diff --git a/forge-core/src/main/java/forge/deck/DeckRecognizer.java b/forge-core/src/main/java/forge/deck/DeckRecognizer.java
index 1d7aa3b1cd2..59df56a6fb0 100644
--- a/forge-core/src/main/java/forge/deck/DeckRecognizer.java
+++ b/forge-core/src/main/java/forge/deck/DeckRecognizer.java
@@ -17,18 +17,17 @@
  */
 package forge.deck;
 
+import forge.card.CardDb;
+import forge.card.CardDb.CardArtPreference;
+import forge.card.ICardDatabase;
+import forge.item.PaperCard;
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Calendar;
 import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
-
-import forge.card.CardDb;
-import forge.card.CardDb.SetPreference;
-import forge.card.ICardDatabase;
-import forge.item.PaperCard;
-
 /**
  * <p>
  * DeckRecognizer class.
@@ -105,7 +104,7 @@ public class DeckRecognizer {
     //private static final Pattern READ_SEPARATED_EDITION = Pattern.compile("[[\\(\\{]([a-zA-Z0-9]){1,3})[]*\\s+(.*)");
     private static final Pattern SEARCH_SINGLE_SLASH = Pattern.compile("(?<=[^/])\\s*/\\s*(?=[^/])");
 
-    private final SetPreference useLastSet;
+    private final CardArtPreference useLastSet;
     private final ICardDatabase db;
     private Date recognizeCardsPrintedBefore = null;
     
@@ -114,10 +113,10 @@ public class DeckRecognizer {
             useLastSet = null;
         }
         else if (onlyCoreAndExp) {
-            useLastSet = SetPreference.LatestCoreExp;
+            useLastSet = CardArtPreference.LatestPrintNoPromoNoOnline;
         }
         else {
-            useLastSet = SetPreference.Latest;
+            useLastSet = CardArtPreference.LatestPrint;
         }
         this.db = db;
     }
@@ -156,7 +155,7 @@ public class DeckRecognizer {
     }
 
     private PaperCard tryGetCard(String text) {
-        return db.getCardFromEdition(text, recognizeCardsPrintedBefore, useLastSet);
+        return db.getCardFromEditions(text, useLastSet, recognizeCardsPrintedBefore);
     }
     
     private Token recognizePossibleNameAndNumber(final String name, final int n) {