diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeFromDeck.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeFromDeck.java
index 09d741e05ab..892efb3cdf5 100644
--- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeFromDeck.java
+++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/CubeFromDeck.java
@@ -20,7 +20,7 @@ public class CubeFromDeck extends DraftCube {
 
         if (cards != null) {
             for (DeckCardInfo card : cards.getCards()) {
-                cubeCards.add(new CardIdentity(card.getCardName(), card.getSetCode()));
+                cubeCards.add(new CardIdentity(card.getCardName(), card.getSetCode(), card.getCardNum()));
             }
         }
     }
diff --git a/Mage/src/main/java/mage/game/draft/DraftCube.java b/Mage/src/main/java/mage/game/draft/DraftCube.java
index 2ed8dc9e2ab..32af36e4898 100644
--- a/Mage/src/main/java/mage/game/draft/DraftCube.java
+++ b/Mage/src/main/java/mage/game/draft/DraftCube.java
@@ -17,28 +17,32 @@ public abstract class DraftCube {
 
     public class CardIdentity {
 
-        private String name;
-        private String extension;
+        private final String name;
+        private final String extension;
+        /**
+         * optional number in the extension (some sets have multiple version of a card)
+         * null means no set one.
+         */
+        private final String number;
 
         public CardIdentity(String name, String extension) {
+            this(name, extension, null);
+        }
+
+        public CardIdentity(String name, String extension, String number) {
             this.name = name;
             this.extension = extension;
+            this.number = number;
         }
 
         public String getName() {
             return name;
         }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
         public String getExtension() {
             return extension;
         }
-
-        public void setExtension(String extension) {
-            this.extension = extension;
+        public String getCardNumber() {
+            return number;
         }
     }
 
@@ -84,7 +88,9 @@ public abstract class DraftCube {
                 if (!cardId.getName().isEmpty()) {
                     CardInfo cardInfo = null;
                     if (!cardId.getExtension().isEmpty()) {
-                        cardInfo = CardRepository.instance.findCardWithPreferredSetAndNumber(cardId.getName(), cardId.getExtension(), null);
+                        cardInfo = CardRepository.instance.findCardWithPreferredSetAndNumber(
+                                cardId.getName(), cardId.getExtension(), cardId.getCardNumber()
+                        );
                     } else {
                         cardInfo = CardRepository.instance.findPreferredCoreExpansionCard(cardId.getName());
                     }