diff --git a/src/magic/card/Mirror_Entity.java b/src/magic/card/Mirror_Entity.java
index c2755c4aa4..e6b1b9cfaa 100644
--- a/src/magic/card/Mirror_Entity.java
+++ b/src/magic/card/Mirror_Entity.java
@@ -10,6 +10,7 @@ import magic.model.MagicSubType;
 import magic.model.action.MagicBecomesCreatureAction;
 import magic.model.action.MagicPlayAbilityAction;
 import magic.model.condition.MagicCondition;
+import magic.model.condition.MagicConditionFactory;
 import magic.model.event.MagicActivationHints;
 import magic.model.event.MagicEvent;
 import magic.model.event.MagicPayManaCostEvent;
@@ -26,13 +27,13 @@ import java.util.Set;
 
 public class Mirror_Entity {
     public static final MagicPermanentActivation A  = new MagicPermanentActivation( 
-            new MagicCondition[]{MagicManaCost.X.getCondition()},
+            new MagicCondition[]{MagicConditionFactory.ManaCost("{X}")},
             new MagicActivationHints(MagicTiming.Pump,true,1),
             "X/X") {
         @Override
         public MagicEvent[] getCostEvent(final MagicPermanent source) {
             return new MagicEvent[]{
-                    new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.X),
+                    new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.create("{X}")),
                     new MagicPlayAbilityEvent(source)};
         }
         @Override
diff --git a/src/magic/card/Oracle_of_Nectars.java b/src/magic/card/Oracle_of_Nectars.java
index 1ce2292efd..976a89fe39 100644
--- a/src/magic/card/Oracle_of_Nectars.java
+++ b/src/magic/card/Oracle_of_Nectars.java
@@ -7,6 +7,7 @@ import magic.model.MagicPermanent;
 import magic.model.MagicSource;
 import magic.model.action.MagicChangeLifeAction;
 import magic.model.condition.MagicCondition;
+import magic.model.condition.MagicConditionFactory;
 import magic.model.event.MagicActivationHints;
 import magic.model.event.MagicEvent;
 import magic.model.event.MagicPayManaCostTapEvent;
@@ -15,12 +16,12 @@ import magic.model.event.MagicTiming;
 
 public class Oracle_of_Nectars {
     public static final MagicPermanentActivation A = new MagicPermanentActivation(
-            new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicManaCost.X.getCondition()},
+            new MagicCondition[]{MagicCondition.CAN_TAP_CONDITION,MagicConditionFactory.ManaCost("{X}")},
             new MagicActivationHints(MagicTiming.Draw),
             "Life+X") {
         @Override
         public MagicEvent[] getCostEvent(final MagicPermanent source) {
-            return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.X)};
+            return new MagicEvent[]{new MagicPayManaCostTapEvent(source,source.getController(),MagicManaCost.create("{X}"))};
         }
         @Override
         public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {
diff --git a/src/magic/card/Rise_of_the_Hobgoblins.java b/src/magic/card/Rise_of_the_Hobgoblins.java
index dd5fb83dbb..923373c358 100644
--- a/src/magic/card/Rise_of_the_Hobgoblins.java
+++ b/src/magic/card/Rise_of_the_Hobgoblins.java
@@ -84,7 +84,7 @@ public class Rise_of_the_Hobgoblins {
                     permanent,
                     player,
                     new MagicMayChoice(
-                        new MagicPayManaCostChoice(MagicManaCost.X)
+                        new MagicPayManaCostChoice(MagicManaCost.create("{X}"))
                     ),
                     this,
                     "You may pay$ {X}$. If you do, put X 1/1 red and white Goblin Soldier creature tokens onto the battlefield.");
diff --git a/src/magic/model/MagicManaCost.java b/src/magic/model/MagicManaCost.java
index e9ced17800..2efbd91fc6 100644
--- a/src/magic/model/MagicManaCost.java
+++ b/src/magic/model/MagicManaCost.java
@@ -43,7 +43,6 @@ public class MagicManaCost {
         IconImages.COST_SIXTEEN
     };
     
-    public static final MagicManaCost X=MagicManaCost.create("{X}");
     public static final MagicManaCost ZERO=MagicManaCost.create("{0}");
 
     private final String costText;