diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterbalanceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterbalanceTest.java
index 47c061f3fc7..da13e7807b9 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterbalanceTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterbalanceTest.java
@@ -58,7 +58,7 @@ public class CounterbalanceTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerB, "Counterbalance");
         addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
 
-        addCard(Zone.LIBRARY, playerB, "Desert Twister"); // cmc = 6 ({G}{G}{4} because DeatGrasp = 2 + 4 (of X) = 6
+        addCard(Zone.LIBRARY, playerB, "Desert Twister"); // cmc = 6 ({G}{G}{4} because DeathGrasp = 2 + 4 (of X) = 6
         skipInitShuffling(); // so the set to top card stays at top
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Death Grasp", "targetPlayer=PlayerB");
diff --git a/Mage/src/mage/util/CardUtil.java b/Mage/src/mage/util/CardUtil.java
index c448a9f2161..9ec3aae9277 100644
--- a/Mage/src/mage/util/CardUtil.java
+++ b/Mage/src/mage/util/CardUtil.java
@@ -533,7 +533,9 @@ public class CardUtil {
 
     public static Set<Integer> getCMC(MageObject object) {
         Set<Integer> cmcObject = new HashSet<>();
-        if (object instanceof Card) {
+        if (object instanceof Spell) {
+            cmcObject.add(((Spell)object).getConvertedManaCost());
+        } else if (object instanceof Card) {
             Card card = (Card) object;
             if (card instanceof SplitCard) {
                 SplitCard splitCard = (SplitCard) card;
@@ -542,8 +544,6 @@ public class CardUtil {
             } else {
                 cmcObject.add(card.getManaCost().convertedManaCost());
             }
-        } else if (object instanceof Spell) {
-                cmcObject.add(((Spell)object).getConvertedManaCost());
         } 
         return cmcObject;
     }