diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 38451af291..318a29fe14 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -276,9 +276,10 @@ void GameState::PlayersFinalized()
 			m_pCurSong = pProfile->m_pLastSong;
 	}
 
-	FOREACH_CpuPlayer( pn )
+	FOREACH_PlayerNumber( pn )
 	{
-		ApplyModifiers( pn, DEFAULT_CPU_MODIFIERS );
+		if( !IsHumanPlayer(pn) )
+			ApplyModifiers( pn, DEFAULT_CPU_MODIFIERS );
 	}
 }
 
diff --git a/stepmania/src/PlayerNumber.cpp b/stepmania/src/PlayerNumber.cpp
index 3e8e9d813a..fd32f47f86 100644
--- a/stepmania/src/PlayerNumber.cpp
+++ b/stepmania/src/PlayerNumber.cpp
@@ -54,11 +54,11 @@ PlayerNumber GetNextEnabledPlayer( PlayerNumber pn )
 	return PLAYER_INVALID;
 }
 
-PlayerNumber GetNextCpuPlayer( PlayerNumber pn )
+PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn )
 {
 	for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
 	{
-		if( GAMESTATE->IsCpuPlayer(p) )
+		if( !GAMESTATE->IsHumanPlayer(p) )
 			return p;
 	}
 	return PLAYER_INVALID;
diff --git a/stepmania/src/PlayerNumber.h b/stepmania/src/PlayerNumber.h
index 7e110a50ce..dafba70562 100644
--- a/stepmania/src/PlayerNumber.h
+++ b/stepmania/src/PlayerNumber.h
@@ -29,11 +29,11 @@ enum PlayerNumber {
 #define FOREACH_PlayerNumber( pn ) FOREACH_ENUM( PlayerNumber, NUM_PLAYERS, pn )
 #define FOREACH_HumanPlayer( pn ) for( PlayerNumber pn=GetNextHumanPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextHumanPlayer(pn) )
 #define FOREACH_EnabledPlayer( pn ) for( PlayerNumber pn=GetNextEnabledPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextEnabledPlayer(pn) )
-#define FOREACH_CpuPlayer( pn ) for( PlayerNumber pn=GetNextCpuPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextCpuPlayer(pn) )
+#define FOREACH_PotentialCpuPlayer( pn ) for( PlayerNumber pn=GetNextPotentialCpuPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextPotentialCpuPlayer(pn) )
 
 PlayerNumber GetNextHumanPlayer( PlayerNumber pn );
 PlayerNumber GetNextEnabledPlayer( PlayerNumber pn );
-PlayerNumber GetNextCpuPlayer( PlayerNumber pn );
+PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn );
 
 const PlayerNumber	OPPOSITE_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 };