diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 21de7bd4a3..0a17dbfe41 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1221,58 +1221,6 @@ void ScreenGameplay::Update( float fDeltaTime )
 	m_BeginnerHelper.Update(fDeltaTime);
 	
 
-	/* Set g_CurStageStats.bFailed for failed players.  In, FAIL_IMMEDIATE, send
-	 * SM_BeginFailed if all players failed, and kill dead Oni players. */
-	switch( GAMESTATE->m_SongOptions.m_FailType )
-	{
-	case SongOptions::FAIL_OFF:
-		// don't allow fail
-		break;
-	default:
-		// check for individual fail
-		FOREACH_EnabledPlayer( pn )
-		{
-			if( (m_pLifeMeter[pn] && !m_pLifeMeter[pn]->IsFailing()) || 
-				(m_pCombinedLifeMeter && !m_pCombinedLifeMeter->IsFailing(pn)) )
-				continue; /* isn't failing */
-			if( g_CurStageStats.bFailed[pn] )
-				continue; /* failed and is already dead */
-		
-			/* If recovery is enabled, only set fail if both are failing.
-			 * There's no way to recover mid-song in battery mode. */
-			if( GAMESTATE->m_SongOptions.m_LifeType != SongOptions::LIFE_BATTERY &&
-				PREFSMAN->m_bTwoPlayerRecovery && !GAMESTATE->AllAreDead() )
-				continue;
-
-			LOG->Trace("Player %d failed", (int)pn);
-			g_CurStageStats.bFailed[pn] = true;	// fail
-
-			if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY &&
-				GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_IMMEDIATE )
-			{
-				if( !g_CurStageStats.AllFailedEarlier() )	// if not the last one to fail
-				{
-					// kill them!
-					SOUND->PlayOnceFromDir( THEME->GetPathS(m_sName,"oni die") );
-					ShowOniGameOver(pn);
-					m_Player[pn].Init();		// remove all notes and scoring
-					m_Player[pn].FadeToFail();	// tell the NoteField to fade to white
-				}
-			}
-		}
-		break;
-	}
-
-	/* If FAIL_IMMEDIATE and everyone is failing, start SM_BeginFailed. */
-	if( GAMESTATE->AllAreDead() && GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_IMMEDIATE )
-	{
-		if( PREFSMAN->m_bMin1FullSongInCourses && GAMESTATE->GetCourseSongIndex()==0 )
-			;	// do nothing
-		else
-			SCREENMAN->PostMessageToTopScreen( SM_BeginFailed, 0 );
-	}
-
-
 	//
 	// update GameState HealthState
 	//
@@ -1306,6 +1254,57 @@ void ScreenGameplay::Update( float fDeltaTime )
 	switch( m_DancingState )
 	{
 	case STATE_DANCING:
+		/* Set g_CurStageStats.bFailed for failed players.  In, FAIL_IMMEDIATE, send
+		* SM_BeginFailed if all players failed, and kill dead Oni players. */
+		switch( GAMESTATE->m_SongOptions.m_FailType )
+		{
+		case SongOptions::FAIL_OFF:
+			// don't allow fail
+			break;
+		default:
+			// check for individual fail
+			FOREACH_EnabledPlayer( pn )
+			{
+				if( (m_pLifeMeter[pn] && !m_pLifeMeter[pn]->IsFailing()) || 
+					(m_pCombinedLifeMeter && !m_pCombinedLifeMeter->IsFailing(pn)) )
+					continue; /* isn't failing */
+				if( g_CurStageStats.bFailed[pn] )
+					continue; /* failed and is already dead */
+			
+				/* If recovery is enabled, only set fail if both are failing.
+				* There's no way to recover mid-song in battery mode. */
+				if( GAMESTATE->m_SongOptions.m_LifeType != SongOptions::LIFE_BATTERY &&
+					PREFSMAN->m_bTwoPlayerRecovery && !GAMESTATE->AllAreDead() )
+					continue;
+
+				LOG->Trace("Player %d failed", (int)pn);
+				g_CurStageStats.bFailed[pn] = true;	// fail
+
+				if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY &&
+					GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_IMMEDIATE )
+				{
+					if( !g_CurStageStats.AllFailedEarlier() )	// if not the last one to fail
+					{
+						// kill them!
+						SOUND->PlayOnceFromDir( THEME->GetPathS(m_sName,"oni die") );
+						ShowOniGameOver(pn);
+						m_Player[pn].Init();		// remove all notes and scoring
+						m_Player[pn].FadeToFail();	// tell the NoteField to fade to white
+					}
+				}
+			}
+			break;
+		}
+
+		/* If FAIL_IMMEDIATE and everyone is failing, start SM_BeginFailed. */
+		if( GAMESTATE->AllAreDead() && GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_IMMEDIATE )
+		{
+			if( PREFSMAN->m_bMin1FullSongInCourses && GAMESTATE->GetCourseSongIndex()==0 )
+				;	// do nothing
+			else
+				SCREENMAN->PostMessageToTopScreen( SM_BeginFailed, 0 );
+		}
+
 		//
 		// Update living players' alive time
 		//