diff --git a/projects/mtg/bin/Res/sets/CFX/_cards.dat b/projects/mtg/bin/Res/sets/CFX/_cards.dat
index 376bb4c58..94494a16d 100644
--- a/projects/mtg/bin/Res/sets/CFX/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CFX/_cards.dat
@@ -694,7 +694,7 @@ toughness=1
 [card]
 text=Enchant creature     When a creature is put into a graveyard from play, destroy enchanted creature.
 target=creature
-auto=@movedTo(creature|graveyard):destroy
+auto=@movedTo(creature|graveyard) from(inplay):destroy
 id=179891
 name=Yoke of the Damned
 rarity=C
diff --git a/projects/mtg/bin/Res/sets/LRW/_cards.dat b/projects/mtg/bin/Res/sets/LRW/_cards.dat
index 4f2c06fb1..a0386020d 100644
--- a/projects/mtg/bin/Res/sets/LRW/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LRW/_cards.dat
@@ -87,7 +87,7 @@ toughness=1
 [card]
 text=Whenever another Goblin you control is put into a graveyard from play, you may have Boggart Shenanigans deal 1 damage to target player.
 id=139445
-auto=@movedTo(creature[goblin]|mygraveyard):damage:1 target(player)
+auto=@movedTo(creature[goblin]|graveyard) from(myinplay):may damage:1 target(player)
 name=Boggart Shenanigans
 rarity=U
 type=Enchantment
@@ -521,8 +521,8 @@ toughness=1
 [/card]
 [card]
 text=Whenever an attacking Kithkin or Elf is put into your graveyard from play, you may draw a card.
-auto=@movedTo(kithkin[attacking]|mygraveyard):draw:1
-auto=@movedTo(elf[attacking]|mygraveyard):draw:1
+auto=@movedTo(kithkin[attacking]|mygraveyard) from(inplay):draw:1
+auto=@movedTo(elf[attacking]|mygraveyard) from(inplay):draw:1
 id=139497
 name=Kithkin Mourncaller
 rarity=U