diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 7b9b42775..e61128d1d 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -19077,8 +19077,7 @@ type=World Enchantment
 [/card]
 [card]
 name=Gravity Well
-auto=@each my blockers:-flying all(creature[attacking;flying]|opponentBattlefield)
-auto=@each opponent blockers:-flying all(creature[attacking;flying]|myBattlefield)
+auto=@each blockers:all(creature[attacking;flying]|battlefield) -flying
 text=Whenever a creature with flying attacks, it loses flying until end of turn.
 mana={1}{G}{G}
 type=Enchantment
@@ -31781,7 +31780,7 @@ toughness=6
 [/card]
 [card]
 name=Orim's Prayer
-auto=@each blockers step:foreach(creature[attacking]|opponentbattlefield) life:1
+auto=@each blockers:foreach(creature[attacking]|opponentbattlefield) life:1
 text=Whenever one or more creatures attack you, you gain 1 life for each attacking creature.
 mana={1}{W}{W}
 type=Enchantment
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index 5de9fdfc5..e70fbc47b 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -261,6 +261,8 @@ goblin_offensive.txt
 goblin_razerunners.txt
 golgari_germination_i153.txt
 gravedigger.txt
+gravity_well.txt
+gravity_well2.txt
 great_defender.txt
 hannas_custody.txt
 harpoon_sniper.txt
diff --git a/projects/mtg/bin/Res/test/gravity_well.txt b/projects/mtg/bin/Res/test/gravity_well.txt
new file mode 100644
index 000000000..d258d8c09
--- /dev/null
+++ b/projects/mtg/bin/Res/test/gravity_well.txt
@@ -0,0 +1,25 @@
+#Testing Gravity Well with flying creature on player's side attacking, and non-flying creature on AI's side.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Tidehollow Strix,Gravity Well
+[PLAYER2]
+inplay:Grizzly Bears
+[DO]
+next
+next
+Tidehollow Strix
+next
+Grizzly Bears
+next
+next
+next
+[ASSERT]
+SECONDMAIN
+[PLAYER1]
+inplay:Gravity Well
+graveyard:Tidehollow Strix
+[PLAYER2]
+graveyard:Grizzly Bears
+life:20
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/gravity_well2.txt b/projects/mtg/bin/Res/test/gravity_well2.txt
new file mode 100644
index 000000000..89a75422e
--- /dev/null
+++ b/projects/mtg/bin/Res/test/gravity_well2.txt
@@ -0,0 +1,24 @@
+#Testing Gravity Well with flying creature on player's side attacking, and Rishadan Airship (block only creature with flying)
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Tidehollow Strix,Gravity Well
+[PLAYER2]
+inplay:Rishadan Airship
+[DO]
+next
+next
+Tidehollow Strix
+next
+Rishadan Airship
+next
+next
+next
+[ASSERT]
+SECONDMAIN
+[PLAYER1]
+inplay:Gravity Well,Tidehollow Strix
+[PLAYER2]
+inplay:Rishadan Airship
+life:18
+[END]
\ No newline at end of file