diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 5468d6935..e5198b115 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -43626,7 +43626,9 @@ toughness=1
 name=Rancid Earth
 target=land
 auto=destroy
-auto=aslongas(*|mygraveyard) damage:1 all(creature,player) >6
+auto=aslongas(*|mygraveyard) lord(creature) damage:1 >1
+auto=aslongas(*|mygraveyard) damage:1 controller >1
+auto=aslongas(*|mygraveyard) damage:1 opponent >1
 text=Destroy target land. -- Threshold - If seven or more cards are in your graveyard, instead destroy that land and Rancid Earth deals 1 damage to each creature and each player.
 mana={1}{B}{B}
 type=Sorcery
@@ -55391,7 +55393,7 @@ type=Instant
 [/card]
 [card]
 name=Swirling Sandstorm
-auto=aslongas(*|mygraveyard) damage:5 all(creature[-flying]) >6
+auto=aslongas(*|mygraveyard) lord(creature[-flying]) damage:5 >6
 text=Threshold - Swirling Sandstorm deals 5 damage to each creature without flying if seven or more cards are in your graveyard.
 mana={3}{R}
 type=Sorcery
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index b394d8c9e..ce6ade65d 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -412,6 +412,8 @@ quilled_sliver.txt
 rain_of_filth_i206.txt
 rain_of_filth_i283.txt
 rampant_growth.txt
+rancid_earth_with_threshold.txt
+rancid_earth_without_threshold.txt
 rancor.txt
 ray_of_command.txt
 ray_of_command_i176.txt
diff --git a/projects/mtg/bin/Res/test/rancid_earth_with_threshold.txt b/projects/mtg/bin/Res/test/rancid_earth_with_threshold.txt
new file mode 100644
index 000000000..294b9edf7
--- /dev/null
+++ b/projects/mtg/bin/Res/test/rancid_earth_with_threshold.txt
@@ -0,0 +1,25 @@
+#Testing Rancid Earth without Treshold.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Rancid Earth
+inplay:Raging Goblin
+graveyard:Swamp,Swamp,Swamp,Swamp,Swamp,Swamp,Swamp
+life:20
+manapool:{1}{B}{B}
+[PLAYER2]
+inplay:Mountain,Lightning Elemental
+life:20
+[DO]
+Rancid Earth
+Mountain
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:Raging Goblin,Rancid Earth,Swamp,Swamp,Swamp,Swamp,Swamp,Swamp,Swamp
+manapool:{0}
+life:19
+[PLAYER2]
+graveyard:Lightning Elemental,Mountain
+life:19
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/rancid_earth_without_threshold.txt b/projects/mtg/bin/Res/test/rancid_earth_without_threshold.txt
new file mode 100644
index 000000000..5e085e0f9
--- /dev/null
+++ b/projects/mtg/bin/Res/test/rancid_earth_without_threshold.txt
@@ -0,0 +1,27 @@
+#Testing Rancid Earth without Treshold.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Rancid Earth
+inplay:Raging Goblin
+graveyard:Swamp
+life:20
+manapool:{1}{B}{B}
+[PLAYER2]
+inplay:Mountain,Lightning Elemental
+life:20
+[DO]
+Rancid Earth
+Mountain
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Raging Goblin
+graveyard:Rancid Earth,Swamp
+manapool:{0}
+life:20
+[PLAYER2]
+inplay:Lightning Elemental
+graveyard:Mountain
+life:20
+[END]
\ No newline at end of file