diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index a7e28c751..77548df4c 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -69828,7 +69828,7 @@ toughness=1
 name=Orgg
 abilities=trample
 auto=cantbeblockerof(creature[white;power>=3])
-auto=aslongas(creature[power>=3;-tapped]|opponentbattlefield]) cantattack
+auto=aslongas(creature[power>=3;-tapped]|opponentbattlefield) cantattack
 text=Trample -- Orgg can't attack if defending player controls an untapped creature with power 3 or greater. -- Orgg can't block creatures with power 3 or greater.
 mana={3}{R}{R}
 type=Creature
diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp
index 72fcb8aca..22a90802a 100644
--- a/projects/mtg/src/GameObserver.cpp
+++ b/projects/mtg/src/GameObserver.cpp
@@ -593,15 +593,19 @@ void GameObserver::gameStateBasedEffects()
 	/////////////////////////////////////
     for (int d = 0; d < 2; d++)
     {
-        MTGGameZone * zone = players[d]->game->inPlay;
-        if (mLayers->stackLayer()->count(0, NOT_RESOLVED) == 0)
-		{
-            for (int c = zone->nb_cards - 1; c >= 0; c--)
+        MTGGameZone * dzones[] = { players[d]->game->inPlay, players[d]->game->graveyard, players[d]->game->hand, players[d]->game->library };
+        for (int k = 0; k < 4; k++)
+        {
+            MTGGameZone * zone = dzones[k];
+            if (mLayers->stackLayer()->count(0, NOT_RESOLVED) == 0)
             {
-		        zone->cards[c]->cardistargetted = 0;
-		        zone->cards[c]->cardistargetter = 0;
+                for (int c = zone->nb_cards - 1; c >= 0; c--)
+                {
+		            zone->cards[c]->cardistargetted = 0;
+		            zone->cards[c]->cardistargetter = 0;
+                }
             }
-        }
+        }//check for losers if its GAMEOVER clear the stack to allow gamestateeffects to continue
         players[d]->DeadLifeState();
     }
     ////////////////////////////////////