diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index b0de6fb8e0..92d9682a24 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -451,7 +451,7 @@ void InputMapper::AutoMapJoysticksForCurrentGame()
 			// We have a mapping for this joystick
 			//
 			GameController gc = (GameController)iNumJoysticksMapped;
-			if( gc >= GAME_CONTROLLER_INVALID )
+			if( gc >= MAX_GAME_CONTROLLERS )
 				break;	// stop mapping.  We already mapped one device for each game controller.
 
 			LOG->Info( "Applying default joystick mapping #%d for device '%s' (%s)",