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 07d61ffdfe3..2dc69ae4579 100644
--- a/Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java
+++ b/Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java
@@ -28,7 +28,9 @@
 
 package mage.client.util;
 
-import mage.sets.Sets;
+import mage.cards.Card;
+import mage.cards.repository.CardInfo;
+import mage.cards.repository.CardRepository;
 import mage.view.CardView;
 import mage.view.CardsView;
 import mage.view.SimpleCardView;
@@ -44,9 +46,9 @@ public class CardsViewUtil {
         CardsView cards = new CardsView();
 
         for (SimpleCardView simple: view.values()) {
-            mage.cards.Card card = Sets.findCard(simple.getExpansionSetCode(), simple.getCardNumber());
+            CardInfo cardInfo = CardRepository.instance.findCard(simple.getExpansionSetCode(), simple.getCardNumber());
+            Card card = cardInfo != null ? cardInfo.getCard() : null;
             if (card != null) {
-
                 cards.put(simple.getId(), new CardView(card, simple.getId()));
             }
         }
diff --git a/Mage.Sets/src/mage/sets/Sets.java b/Mage.Sets/src/mage/sets/Sets.java
index 48c0ab17bc0..88f73efc362 100644
--- a/Mage.Sets/src/mage/sets/Sets.java
+++ b/Mage.Sets/src/mage/sets/Sets.java
@@ -305,23 +305,6 @@ public class Sets extends HashMap<String, ExpansionSet> {
         return null;
     }
 
-    public static Card findCard(String expansionsetCode, int cardNum) {
-        if (cardMap.containsKey(expansionsetCode + Integer.toString(cardNum))) {
-            return cardMap.get(expansionsetCode + Integer.toString(cardNum));
-        }
-        if (fINSTANCE.containsKey(expansionsetCode)) {
-            ExpansionSet set = fINSTANCE.get(expansionsetCode);
-            Card card = set.findCard(cardNum);
-            if (card != null) {
-                cardMap.put(expansionsetCode + Integer.toString(cardNum), card);
-                return card;
-            }
-        }
-        logger.warn("Could not find card: set=" + expansionsetCode + "cardNum=" + Integer.toString(cardNum));
-        return null;
-
-    }
-
     public static Card createCard(Class clazz) {
         try {
             Constructor<?> con = clazz.getConstructor(new Class[]{UUID.class});