diff --git a/src/forge/Ability_Mana.java b/src/forge/Ability_Mana.java
index 21cf5015126..1244925a8b8 100644
--- a/src/forge/Ability_Mana.java
+++ b/src/forge/Ability_Mana.java
@@ -54,7 +54,7 @@ abstract public class Ability_Mana extends SpellAbility implements java.io.Seria
         */
 
         this.sourceCard = sourceCard;
-        this.orig = orig;
+        this.orig = (sourceCard.getName().isEmpty() ? orig : orig.replaceAll(sourceCard.getName(), "CARDNAME"));
         setDescription(orig);
         
         /*
@@ -79,7 +79,6 @@ abstract public class Ability_Mana extends SpellAbility implements java.io.Seria
         String[] parts = orig.split(":");
         Mana = parts[1];
         Mana = Mana.replaceAll(" add ", "");
-        setStackDescription("Add " + Mana + " to your mana pool.");
         Mana = Mana.replaceAll(" ", "");
         
         String cost = parts[0];
@@ -204,11 +203,12 @@ abstract public class Ability_Mana extends SpellAbility implements java.io.Seria
     public String Mana() {
         if(!orig.contains("for each")) return Mana;
         else {
-            String[] manaPart = orig.split(":");
+            /*String[] manaPart = orig.split(": add ");
             String m = manaPart[1];
             m = m.replaceAll(" add ", "");
-            //TODO: make this handle "multiple-mana symbol" cases, if they are ever needed
-            m = m.substring(0, 2);
+            //TOhaveDOne: make this handle "multiple-mana symbol" cases, if they are ever needed
+            m = m.substring(0, 2);*/
+        	String m = orig.split(": add ")[1].split(" to ")[0];
             
             String[] parts = orig.split(" for each ");
             int index = parts[1].indexOf(' ');
diff --git a/src/forge/Card.java b/src/forge/Card.java
index dae36224247..00bac0bdc7f 100644
--- a/src/forge/Card.java
+++ b/src/forge/Card.java
@@ -1322,7 +1322,7 @@ public class Card extends MyObservable {
     
     public void addExtrinsicKeyword(String s) {
         //if(!getKeyword().contains(s)){
-        if(s.startsWith("tap: add")) manaAbility.add(new Ability_Mana(this, (getName().isEmpty() ? s : s.replaceAll(getName(), "CARDNAME"))) {
+        if(s.startsWith("tap: add")) manaAbility.add(new Ability_Mana(this, s) {
             private static final long serialVersionUID = 221124403788942412L;
         });
         else extrinsicKeyword.add((getName().isEmpty() ? s :s.replaceAll(getName(), "CARDNAME")));