diff --git a/projects/mtg/bin/Res/sets/CFX/_cards.dat b/projects/mtg/bin/Res/sets/CFX/_cards.dat
index 1709eb5e4..5cb521ef9 100644
--- a/projects/mtg/bin/Res/sets/CFX/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CFX/_cards.dat
@@ -211,6 +211,7 @@ text=Reach (This can block creatures with flying.)  As long as you control a red
 auto=aslongas(*[red]|myinplay) 1/0
 auto=aslongas(*[red]|myinplay) first strike
 id=184990
+abilities=reach
 name=Ember Weaver
 rarity=C
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/POR/_cards.dat b/projects/mtg/bin/Res/sets/POR/_cards.dat
index ca9ed5a90..1e549caf4 100644
--- a/projects/mtg/bin/Res/sets/POR/_cards.dat
+++ b/projects/mtg/bin/Res/sets/POR/_cards.dat
@@ -1426,8 +1426,9 @@ mana={2}{U}
 [/card]
 [card]
 text=Haste (This creature can attack the turn it comes under your control.)  When Thundermare comes into play, tap all other creatures.
-auto=tap all(creature) other
+auto=tap all(creature[-Thundermare])
 id=4364
+abilities=haste
 name=Thundermare
 rarity=R
 type=Creature
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index fe262eca7..bbaf18b8a 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -262,7 +262,8 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
       if (card->hasType("sorcery") || card->hasType("instant")) oneShot = 1;
       if (i == 3) oneShot = 1;
       if (a->oneShot) oneShot = 1;
-      Damageable * _target = spell->getNextDamageableTarget();
+      Damageable * _target = NULL;
+	  if (spell) _target = spell->getNextDamageableTarget();
       if (!_target) _target = target;
       switch(i){
         case 0: result =  NEW ALord(id, card, lordTargets, lordIncludeSelf, a); break;