diff --git a/Mage/src/main/java/mage/abilities/SpellAbility.java b/Mage/src/main/java/mage/abilities/SpellAbility.java
index a0c89bea84..e12d0c472d 100644
--- a/Mage/src/main/java/mage/abilities/SpellAbility.java
+++ b/Mage/src/main/java/mage/abilities/SpellAbility.java
@@ -176,8 +176,7 @@ public class SpellAbility extends ActivatedAbilityImpl {
         return cardName;
     }
 
-    public int getConvertedManaCost() {
-        int cmc = 0;
+    public int getConvertedXManaCost() {
         int xMultiplier = 0;
         for (String symbolString : getManaCosts().getSymbols()) {
             int index = symbolString.indexOf("{X}");
@@ -187,12 +186,7 @@ public class SpellAbility extends ActivatedAbilityImpl {
                 index = symbolString.indexOf("{X}");
             }
         }
-        if (getSpellAbilityType().equals(SpellAbilityType.BASE_ALTERNATE)) {
-            cmc += getManaCostsToPay().getX() * xMultiplier;
-        } else {
-            cmc += getManaCosts().convertedManaCost() + getManaCostsToPay().getX() * xMultiplier;
-        }
-        return cmc;
+        return getManaCostsToPay().getX() * xMultiplier;
 
     }
 }
diff --git a/Mage/src/main/java/mage/game/stack/Spell.java b/Mage/src/main/java/mage/game/stack/Spell.java
index e6252d91ed..83eeccda9c 100644
--- a/Mage/src/main/java/mage/game/stack/Spell.java
+++ b/Mage/src/main/java/mage/game/stack/Spell.java
@@ -365,7 +365,7 @@ public class Spell extends StackObjImpl implements Card {
                 }
             }
         } else {
-        	card.removeFromZone(game, Zone.STACK, sourceId);
+            card.removeFromZone(game, Zone.STACK, sourceId);
         }
     }
 
@@ -503,11 +503,9 @@ public class Spell extends StackObjImpl implements Card {
             return 0;
         }
         for (SpellAbility spellAbility : spellAbilities) {
-            cmc += spellAbility.getConvertedManaCost();
-        }
-        if (this.getSpellAbility().getSpellAbilityType().equals(SpellAbilityType.BASE_ALTERNATE)) {
-            cmc += getCard().getManaCost().convertedManaCost();
+            cmc += spellAbility.getConvertedXManaCost();
         }
+        cmc += getCard().getManaCost().convertedManaCost();
         return cmc;
     }