diff --git a/res/cardsfolder/b/blood_moon.txt b/res/cardsfolder/b/blood_moon.txt
index 6d74f26fae5..e5692f61f0e 100644
--- a/res/cardsfolder/b/blood_moon.txt
+++ b/res/cardsfolder/b/blood_moon.txt
@@ -2,8 +2,7 @@ Name:Blood Moon
 ManaCost:2 R
 Types:Enchantment
 Text:no text
-S:Mode$ Continuous | Affected$ Land.nonBasic | RemoveAllAbilities$ True
-K:stAnimateAll:Land.nonBasic:no change/no change/Overwrite:Land,Mountain,RemoveSubTypes:no colors:Overwrite:No Condition:Nonbasic lands are Mountains.
+S:Mode$ Continuous | Affected$ Land.nonBasic | AddType$ Mountain | RemoveSubTypes$ True | RemoveAllAbilities$ True | Description$ Nonbasic lands are Mountains.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_moon.jpg
diff --git a/res/cardsfolder/l/lignify.txt b/res/cardsfolder/l/lignify.txt
index 1fcc0dbc3b5..e2987905bda 100644
--- a/res/cardsfolder/l/lignify.txt
+++ b/res/cardsfolder/l/lignify.txt
@@ -4,8 +4,7 @@ Types:Tribal Enchantment Treefolk Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | RemoveAllAbilities$ True
-K:stAnimateEnchanted:Creature:0/4/Overwrite:Creature,Treefolk,Overwrite:no colors:Overwrite:No condition:Enchanted creature is a 0/4 Treefolk with no abilities.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | SetPower$ 0 | SetToughness$ 4 | AddType$ Treefolk | RemoveCreatureTypes$ True | RemoveAllAbilities$ True | Description$ Enchanted creature is a 0/4 Treefolk with no abilities.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lignify.jpg
diff --git a/src/main/java/forge/card/spellability/Ability_Mana.java b/src/main/java/forge/card/spellability/Ability_Mana.java
index 83c51a23b63..f7d31c5fc34 100644
--- a/src/main/java/forge/card/spellability/Ability_Mana.java
+++ b/src/main/java/forge/card/spellability/Ability_Mana.java
@@ -276,9 +276,12 @@ abstract public class Ability_Mana extends Ability_Activated implements java.io.
     @Override
     public boolean equals(Object o) {
         //Mana abilities with same Descriptions are "equal"
-        if (o == null)
+        if (o == null || !(o instanceof Ability_Mana))
             return false;
-        return o.toString().equals(this.toString());
+        
+        Ability_Mana abm = (Ability_Mana) o;
+        
+        return abm.toUnsuppressedString().equals(this.toUnsuppressedString());
     }
 
 }//end class Ability_Mana
diff --git a/src/main/java/forge/card/spellability/SpellAbility.java b/src/main/java/forge/card/spellability/SpellAbility.java
index 01c2e823266..2db76765161 100644
--- a/src/main/java/forge/card/spellability/SpellAbility.java
+++ b/src/main/java/forge/card/spellability/SpellAbility.java
@@ -870,6 +870,11 @@ public abstract class SpellAbility {
         if(isSuppressed()) {
             return "";
         }
+
+        return toUnsuppressedString();
+    }
+    
+    public String toUnsuppressedString() {
         
         StringBuilder sb = new StringBuilder();
         SpellAbility node = this;