diff --git a/forge-gui/res/cardsfolder/t/takklemaggot.txt b/forge-gui/res/cardsfolder/t/takklemaggot.txt
index e2d7e89b62b..6e9a8539f1d 100644
--- a/forge-gui/res/cardsfolder/t/takklemaggot.txt
+++ b/forge-gui/res/cardsfolder/t/takklemaggot.txt
@@ -9,10 +9,9 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ EnchantedController | Execute$ Trig
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Enchanted | CounterType$ M0M1 | CounterNum$ 1
 T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigChoose | TriggerDescription$ When enchanted creature dies, that creature's controller chooses a creature that CARDNAME could enchant. If they do, return CARDNAME to the battlefield under your control attached to that creature. If they don't, return CARDNAME to the battlefield under your control as a non-Aura enchantment. It loses "enchant creature" and gains "At the beginning of that player's upkeep, CARDNAME deals 1 damage to them."
 SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredCardController | Choices$ Creature.CanBeEnchantedBy | Mandatory$ True | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | AttachedTo$ ChosenCard | ConditionDefined$ ChosenCard | ConditionPresent$ Creature | ConditionCompare$ GE1 | SubAbility$ DBAnimate
-SVar:DBAnimate:DB$ Animate | Defined$ Self | Types$ Enchantment | RemoveEnchantmentTypes$ True | RemoveKeywords$ Enchant creature | Triggers$ TrigUpkeep | ConditionDefined$ ChosenCard | ConditionPresent$ Creature | ConditionCompare$ EQ0 | SubAbility$ DBPump | Permanent$ True
-SVar:DBPump:DB$ Pump | RememberObjects$ TriggeredCardController | SubAbility$ DBChangeZone2 | ConditionDefined$ ChosenCard | ConditionPresent$ Creature | ConditionCompare$ EQ0
-SVar:DBChangeZone2:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | ConditionDefined$ ChosenCard | ConditionPresent$ Creature | ConditionCompare$ EQ0
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ CorrectedSelf | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | AttachedTo$ ChosenCard | ConditionDefined$ ChosenCard | ConditionPresent$ Creature | ConditionCompare$ GE1 | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ CorrectedSelf | Types$ Enchantment | RemoveEnchantmentTypes$ True | RemoveKeywords$ Enchant creature | Triggers$ TrigUpkeep | RememberObjects$ TriggeredCardController | ConditionDefined$ ChosenCard | ConditionPresent$ Creature | ConditionCompare$ EQ0 | SubAbility$ DBChangeZone2 | Permanent$ True
+SVar:DBChangeZone2:DB$ ChangeZone | Defined$ CorrectedSelf | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | ConditionDefined$ ChosenCard | ConditionPresent$ Creature | ConditionCompare$ EQ0
 SVar:TrigUpkeep:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.IsRemembered | Execute$ TrigDmg | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of that player's upkeep, CARDNAME deals 1 damage to them.
 SVar:TrigDmg:DB$ DealDamage | Defined$ Remembered | NumDmg$ 1
 AI:RemoveDeck:All