diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 55d3f0e977..ed09c9ce27 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -408,9 +408,9 @@ void ScreenGameplay::Init()
 	case PLAY_MODE_ONI:
 	case PLAY_MODE_NONSTOP:
 	case PLAY_MODE_ENDLESS:
-        FOREACH_EnabledPlayer(p)
+        FOREACH_PlayerNumber(p)
 		{
-			if( !SHOW_LIFE_METER_FOR_DISABLED_PLAYERS )
+			if( !GAMESTATE->IsPlayerEnabled(p) && !SHOW_LIFE_METER_FOR_DISABLED_PLAYERS )
 				continue;	// skip
 
 			switch( GAMESTATE->m_SongOptions.m_LifeType )