diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp
index 28598b0ce..2c1195dcd 100644
--- a/projects/mtg/src/GameObserver.cpp
+++ b/projects/mtg/src/GameObserver.cpp
@@ -210,23 +210,23 @@ void GameObserver::userRequestNextGamePhase()
         return;
 
 	bool executeNextPhaseImmediately = true;
-
-	Phase * cPhaseOld = phaseRing->getCurrentPhase();
-	if ((cPhaseOld->id == Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == ORDER) || (cPhaseOld->id
-		== Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == TRIGGERS) || cPhaseOld->id
-		== Constants::MTG_PHASE_COMBATDAMAGE || opponent()->isAI()
-		|| options[Options::optionInterrupt(currentGamePhase)].number)
-	{
-		executeNextPhaseImmediately = false;
-	}
-
-	if (executeNextPhaseImmediately)
-	{
-		nextGamePhase();
-	}
-	else
-	{
-		mLayers->stackLayer()->AddNextGamePhase();
+
+	Phase * cPhaseOld = phaseRing->getCurrentPhase();
+	if ((cPhaseOld->id == Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == ORDER) || (cPhaseOld->id
+		== Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == TRIGGERS) || cPhaseOld->id
+		== Constants::MTG_PHASE_COMBATDAMAGE || opponent()->isAI()
+		|| options[Options::optionInterrupt(currentGamePhase)].number)
+	{
+		executeNextPhaseImmediately = false;
+	}
+
+	if (executeNextPhaseImmediately)
+	{
+		nextGamePhase();
+	}
+	else
+	{
+		mLayers->stackLayer()->AddNextGamePhase();
 	}
 
 }
@@ -427,7 +427,7 @@ void GameObserver::stateEffects()
 	if (combatStep == TRIGGERS)
 		{
       if (!mLayers->stackLayer()->getNext(NULL, 0, NOT_RESOLVED) && !targetChooser && !mLayers->actionLayer()->isWaitingForAnswer())
-			userRequestNextGamePhase();
+				mLayers->stackLayer()->AddNextCombatStep();
 		}
 
 	  //Auto skip Phases