diff --git a/res/cardTemplateScript.py b/res/cardTemplateScript.py
index 159b1861a73..ae05443e019 100755
--- a/res/cardTemplateScript.py
+++ b/res/cardTemplateScript.py
@@ -186,13 +186,13 @@ while inputName != 'quit' :
                         if text.find("When CARDNAME enters the battlefield") != -1 :
                                 print "\n"+text
                                 print "<Trigger Script Start>"
-                                print 'T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ <TriggerFunc> | TriggerDescription$ '+text
+                                print 'T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ <TriggerFunc> | TriggerDescription$ '+text
                                 print 'SVar:<TriggerFunc>:AB$ <Added Triggered Ability HERE>'
                                 print "<Trigger Script End>\n"
                         elif text.find("When CARDNAME leaves the battlefield") != -1 :
                                 print "\n"+text
                                 print "<Trigger Script Start>"
-                                print 'T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.Self | Execute$ <TriggerFunc> | TriggerDescription$ '+text
+                                print 'T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ <TriggerFunc> | TriggerDescription$ '+text
                                 print 'SVar:<TriggerFunc>:AB$ <Added Triggered Ability HERE>'
                                 print "<Trigger Script End>\n"
                         elif text.find("Unleash") != -1 :
diff --git a/res/cardsfolder/x/xantid_swarm.txt b/res/cardsfolder/x/xantid_swarm.txt
index 3bb19ca316b..3f80ec07854 100644
--- a/res/cardsfolder/x/xantid_swarm.txt
+++ b/res/cardsfolder/x/xantid_swarm.txt
@@ -4,8 +4,9 @@ Types:Creature Insect
 PT:0/1
 K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigEffect | TriggerDescription$ When CARDNAME attacks, defending player can't cast spells this turn.
-SVar:TrigEffect:AB$ Effect | Cost$ 0 | Name$ Xantid Swarm Effect | StaticAbilities$ CantBeCast
-SVar:CantBeCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Card | Caster$ DefendingPlayer | Description$ Defending player can't cast spells.
+SVar:TrigEffect:AB$ Effect | Cost$ 0 | Name$ Xantid Swarm Effect | RememberObjects$ DefendingPlayer | StaticAbilities$ CantBeCast | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:CantBeCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Card | Caster$ Player.IsRemembered | Description$ Defending player can't cast spells.
 SVar:RemRandomDeck:True
 SVar:HasAttackEffect:TRUE
 SVar:Rarity:Rare