diff --git a/stepmania/src/arch/Lights/LightsDriver_SystemMessage.cpp b/stepmania/src/arch/Lights/LightsDriver_SystemMessage.cpp
index 185fc90bed..a715049c8c 100644
--- a/stepmania/src/arch/Lights/LightsDriver_SystemMessage.cpp
+++ b/stepmania/src/arch/Lights/LightsDriver_SystemMessage.cpp
@@ -34,7 +34,7 @@ void LightsDriver_SystemMessage::Set( const LightsState *ls )
 	FOREACH_GameController( gc )
 	{
 		s += ssprintf("Controller%d: ",gc+1);
-		for( int gb=GAME_BUTTON_CUSTOM_01; gb<iNumGameButtonsToShow; gb++ )
+		FOREACH_GameButton( gb )
 		{
 			s += ls->m_bGameButtonLights[gc][gb] ? '1' : '0';
 		}