diff --git a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java
index 42740bd678f..45450694d1f 100644
--- a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java
+++ b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java
@@ -401,7 +401,13 @@ public class StaticAbilityContinuous {
 
             // add abilities
             if (addAbilities != null) {
-                for (final String abilty : addAbilities) {
+                for (String abilty : addAbilities) {
+                    if (abilty.contains("CardManaCost")) {
+                        abilty = abilty.replace("CardManaCost", affectedCard.getManaCost().toString());
+                    } else if (abilty.contains("ConvertedManaCost")) {
+                        final String costcmc = Integer.toString(affectedCard.getCMC());
+                        abilty = abilty.replace("ConvertedManaCost", costcmc);
+                    }
                     if (abilty.startsWith("AB")) { // grant the ability
                         final SpellAbility sa = AbilityFactory.getAbility(abilty, affectedCard);
                         sa.setType("Temporary");
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index 9eafeb77993..59858a98214 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -1646,7 +1646,7 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
     
     /**
      * <p>
-     * Getter for the field <code>numDrawnThisTurn</code>.
+     * Getter for the field <code>numDiscardedThisTurn</code>.
      * </p>
      * 
      * @return a int.