diff --git a/projects/mtg/bin/Res/sets/LEG/_cards.dat b/projects/mtg/bin/Res/sets/LEG/_cards.dat
index ad084f95b..b8b0800aa 100644
--- a/projects/mtg/bin/Res/sets/LEG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LEG/_cards.dat
@@ -481,8 +481,9 @@ type=Enchantment
 [/card]
 [card]
 text=Target creature gets +0/+X until end of turn, where X is its converted mana cost.
-id=1614
 target=creature
+auto=0/manacost
+id=1614
 name=Great Defender
 rarity=U
 mana={W}
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 3b49ea58e..b00ffa25d 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -231,6 +231,7 @@ goblin_lackey3.txt
 goblin_lackey4.txt
 goblin_offensive.txt
 gravedigger.txt
+great_defender.txt
 hannas_custody.txt
 harpoon_sniper.txt
 hellfire.txt
diff --git a/projects/mtg/bin/Res/test/great_defender.txt b/projects/mtg/bin/Res/test/great_defender.txt
new file mode 100644
index 000000000..79fd5f3d0
--- /dev/null
+++ b/projects/mtg/bin/Res/test/great_defender.txt
@@ -0,0 +1,23 @@
+#NAME:Great Defender
+#DESC: Target creature gets +0/+X
+#DESC: until end of turn, where X
+#DESC: is its converted mana cost.
+[INIT]
+firstmain
+[PLAYER1]
+inplay:Grizzly Bears
+hand:Great Defender,Lightning Bolt
+manapool:{W}{R}
+[PLAYER2]
+[DO]
+Great Defender
+Grizzly Bears
+Lightning Bolt
+Grizzly Bears
+[ASSERT]
+firstmain
+[PLAYER1]
+inplay:Grizzly Bears
+graveyard:Great Defender,Lightning Bolt
+[PLAYER2]
+[END]
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index 0a4252a05..1e069c1bc 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -1441,13 +1441,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
 	int mana = card->target->getManaCost()->getConvertedCost();
 	game->currentlyActing()->getManaPool()->add(Constants::MTG_COLOR_ARTIFACT, mana);
 	}
-
-  case 1614: // Great Defender
-	{
-	int toughness = card->target->getManaCost()->getConvertedCost();
-	int power = 0;
-	game->addObserver(NEW AInstantPowerToughnessModifierUntilEOT(id, card, card->target, NEW WParsedPT(power,toughness)));
-	}
   
     //Addons ICE-AGE Cards