diff --git a/src/main/java/forge/card/CardDb.java b/src/main/java/forge/card/CardDb.java
index 6522af441ec..c90bbbd789f 100644
--- a/src/main/java/forge/card/CardDb.java
+++ b/src/main/java/forge/card/CardDb.java
@@ -98,6 +98,9 @@ public final class CardDb {
         uniqueCards.put(cardName, lastAdded);
     }
 
+    public boolean isCardSupported(final String cardName) { return uniqueCards.containsKey(cardName.toLowerCase()); }
+    
+    
     // Single fetch
     public CardPrinted getCard(final String name) {
         // Sometimes they read from decks things like "CardName|Set" - but we can handle it
diff --git a/src/main/java/forge/deck/DownloadDeck.java b/src/main/java/forge/deck/DownloadDeck.java
index 6f29c17889e..aa409d0b966 100644
--- a/src/main/java/forge/deck/DownloadDeck.java
+++ b/src/main/java/forge/deck/DownloadDeck.java
@@ -2,6 +2,7 @@ package forge.deck;
 
 import forge.AllZone;
 import forge.Card;
+import forge.card.CardDb;
 
 /**
  * <p>DownloadDeck class.</p>
@@ -141,15 +142,10 @@ public class DownloadDeck {
      * @param CardName a {@link java.lang.String} object.
      * @return a boolean.
      */
-    public boolean isCardSupport(String CardName) {
+    public boolean isCardSupport(String cardName) {
     	// TODO: using AllZone.getCardFactory().getCard() would probably be much faster.
     	
-        for (Card gCard : AllZone.getCardFactory()) {
-            if (CardName.equalsIgnoreCase(gCard.getName())) {
-                return true;
-            }
-        }
-        return false;
+        return CardDb.instance().isCardSupported(cardName);
     }