diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 7ebada930c..336457199a 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -371,11 +371,8 @@ void GameState::PlayersFinalized()
 			m_pPreferredCourse = pProfile->m_lastCourse.ToCourse();
 	}
 
-	FOREACH_PlayerNumber( pn )
-	{
-		if( !IsHumanPlayer(pn) )
-			ApplyModifiers( pn, DEFAULT_CPU_MODIFIERS );
-	}
+	FOREACH_PotentialCpuPlayer( pn )
+		ApplyModifiers( pn, DEFAULT_CPU_MODIFIERS );
 }
 
 void GameState::EndGame()