diff --git a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
index f76451abb63..156feeedaa1 100644
--- a/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
+++ b/Mage.Client/src/main/java/mage/client/deck/generator/DeckGenerator.java
@@ -226,7 +226,7 @@ public class DeckGenerator {
             int tries = 0;
             int count = 0;
             while (count < cardsCount) {
-                Card card = cardPool.get(random.nextInt(cardPoolCount)).getCard();
+                Card card = cardPool.get(random.nextInt(cardPoolCount)).getMockCard();
                 if (cardFitsChosenColors(card, allowedColors)) {
                     spellCardPool.add(card);
                     count++;
@@ -291,7 +291,7 @@ public class DeckGenerator {
             int tries = 0;
             int count = 0;
             while (count < landsCount) {
-                Card card = landCards.get(random.nextInt(allCount)).getCard();
+                Card card = landCards.get(random.nextInt(allCount)).getMockCard();
                 if (cardCardProduceChosenColors(card, allowedColors)) {
                     nonBasicLandCardPool.add(card);
                     count++;
@@ -378,7 +378,7 @@ public class DeckGenerator {
         }
 
         int randomInt = new Random().nextInt(cards.size());
-        return cards.get(randomInt).getCard();
+        return cards.get(randomInt).getMockCard();
 
     }
 
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
index 247b3f957f9..4ec9878f8c1 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
@@ -310,7 +310,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
             else {
                 List<CardInfo> foundCards = CardRepository.instance.findCards(buildCriteria());
                 for (CardInfo cardInfo : foundCards) {
-                    Card card = cardInfo.getCard();
+                    Card card = cardInfo.getMockCard();
                     if (filter.match(card, null)) {
                         filteredCards.add(card);
                     }
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
index eba79010782..95a8b39973e 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
@@ -182,7 +182,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
                                     }
                                 }
                             } else {
-                                card = cardInfo != null ? cardInfo.getCard() : null;
+                                card = cardInfo != null ? cardInfo.getMockCard() : null;
                             }
                             if (card != null) {
                                 deck.getCards().add(card);
@@ -201,7 +201,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
                         } else if (event.getEventName().equals("shift-double-click") && mode == DeckEditorMode.Constructed) {
                             SimpleCardView cardView = (SimpleCardView) event.getSource();
                             CardInfo cardInfo = CardRepository.instance.findCard(cardView.getExpansionSetCode(), cardView.getCardNumber());
-                            Card card = cardInfo != null ? cardInfo.getCard() : null;
+                            Card card = cardInfo != null ? cardInfo.getMockCard() : null;
                             if (card != null) {
                                 deck.getSideboard().add(CardImpl.createCard(card.getClass()));
                             }
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
index 2ebdfd6b5fb..aaf1ebf961f 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
@@ -31,12 +31,11 @@ package mage.client.deckeditor.collection.viewer;
 import mage.cards.Card;
 import mage.cards.CardDimensions;
 import mage.cards.MageCard;
-import mage.client.MageFrame;
-import mage.cards.CardImpl;
 import mage.cards.repository.CardCriteria;
 import mage.cards.repository.CardInfo;
 import mage.cards.repository.CardRepository;
 import mage.cards.repository.ExpansionRepository;
+import mage.client.MageFrame;
 import mage.client.cards.BigCard;
 import mage.client.components.HoverButton;
 import mage.client.plugins.impl.Plugins;
@@ -227,7 +226,7 @@ public class MageBook extends JComponent {
         Rectangle rectangle = new Rectangle();
         rectangle.translate(OFFSET_X, OFFSET_Y);
         for (int i = 0; i < Math.min(conf.CARDS_PER_PAGE / 2, size); i++) {
-            Card card = CardImpl.createCard(cards.get(i).getClassName());
+            Card card = cards.get(i).getMockCard();
             addCard(new CardView(card), bigCard, null, rectangle);
             rectangle = CardPosition.translatePosition(i, rectangle, conf);
         }
@@ -238,7 +237,7 @@ public class MageBook extends JComponent {
 
         rectangle.setLocation(second_page_x, OFFSET_Y);
         for (int i = conf.CARDS_PER_PAGE / 2; i < Math.min(conf.CARDS_PER_PAGE, size); i++) {
-            Card card = CardImpl.createCard(cards.get(i).getClassName());
+            Card card = cards.get(i).getMockCard();
             addCard(new CardView(card), bigCard, null, rectangle);
             rectangle = CardPosition.translatePosition(i - conf.CARDS_PER_PAGE / 2, rectangle, conf);
         }
diff --git a/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java b/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java
index 31da43b2a44..d14d04c24fe 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java
@@ -79,7 +79,7 @@ public class AddLandDialog extends MageDialog {
         }
 
         for (int i = 0; i < number; i++) {
-            Card land = cards.get(random.nextInt(cards.size())).getCard();
+            Card land = cards.get(random.nextInt(cards.size())).getMockCard();
             deck.getCards().add(land);
         }
     }
diff --git a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
index 24d97a1b964..ccd02a41b3f 100644
--- a/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
+++ b/Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
@@ -249,7 +249,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
         // Avatar
         Image image = ImageHelper.getImageFromResources(DEFAULT_AVATAR_PATH);
 
-        topCardPanel = Plugins.getInstance().getMageCard(new CardView(CardRepository.instance.findCard("Forest").getCard()), bigCard, topCardDimension, gameId, true);
+        topCardPanel = Plugins.getInstance().getMageCard(new CardView(CardRepository.instance.findCard("Forest").getMockCard()), bigCard, topCardDimension, gameId, true);
         topCardPanel.setVisible(false);
         panelBackground.add(topCardPanel);
 
diff --git a/Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java b/Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java
index 9f48d42f3ea..c77c240dd14 100644
--- a/Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java
+++ b/Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java
@@ -46,7 +46,7 @@ public class CardsViewUtil {
 
         for (SimpleCardView simple: view.values()) {
             CardInfo cardInfo = CardRepository.instance.findCard(simple.getExpansionSetCode(), simple.getCardNumber());
-            Card card = cardInfo != null ? cardInfo.getCard() : null;
+            Card card = cardInfo != null ? cardInfo.getMockCard() : null;
             if (card != null) {
                 cards.put(simple.getId(), new CardView(card, simple.getId()));
             }
diff --git a/Mage.Client/src/main/java/mage/client/util/DeckUtil.java b/Mage.Client/src/main/java/mage/client/util/DeckUtil.java
index 8be31a46fc0..1b240c389ce 100644
--- a/Mage.Client/src/main/java/mage/client/util/DeckUtil.java
+++ b/Mage.Client/src/main/java/mage/client/util/DeckUtil.java
@@ -52,7 +52,7 @@ public class DeckUtil {
         Deck deck = new Deck();
         for (SimpleCardView cardView : view.getCards().values()) {
             CardInfo cardInfo = CardRepository.instance.findCard(cardView.getExpansionSetCode(), cardView.getCardNumber());
-            Card card = cardInfo != null ? cardInfo.getCard() : null;
+            Card card = cardInfo != null ? cardInfo.getMockCard() : null;
             if (card != null) {
                 deck.getCards().add(card);
             } else {
@@ -61,7 +61,7 @@ public class DeckUtil {
         }
         for (SimpleCardView cardView : view.getSideboard().values()) {
             CardInfo cardInfo = CardRepository.instance.findCard(cardView.getExpansionSetCode(), cardView.getCardNumber());
-            Card card = cardInfo != null ? cardInfo.getCard() : null;
+            Card card = cardInfo != null ? cardInfo.getMockCard() : null;
             if (card != null) {
                 deck.getSideboard().add(card);
             } else {
diff --git a/Mage/src/mage/cards/repository/CardInfo.java b/Mage/src/mage/cards/repository/CardInfo.java
index d3a5ded4453..41bb708c328 100644
--- a/Mage/src/mage/cards/repository/CardInfo.java
+++ b/Mage/src/mage/cards/repository/CardInfo.java
@@ -35,6 +35,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import mage.cards.MockCard;
 import mage.constants.CardType;
 import mage.constants.Rarity;
 import mage.ObjectColor;
@@ -139,6 +140,10 @@ public class CardInfo {
         return CardImpl.createCard(className);
     }
 
+    public Card getMockCard() {
+        return new MockCard(this);
+    }
+
     public ObjectColor getColor() {
         ObjectColor color = new ObjectColor();
         color.setBlack(black);