diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index d6c82d0a57..f5009823c9 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -791,14 +791,14 @@ InputDevice InputMapper::MultiPlayerToInputDevice( MultiPlayer mp )
 {
 	if( mp == MultiPlayer_INVALID )
 		return DEVICE_NONE;
-	return (InputDevice)(mp + DEVICE_JOY1);
+	return enum_add2( DEVICE_JOY1, mp );
 }
 
 MultiPlayer InputMapper::InputDeviceToMultiPlayer( InputDevice id )
 {
 	if( id == DEVICE_NONE )
 		return MultiPlayer_INVALID;
-	return (MultiPlayer)(id - DEVICE_JOY1);
+	return enum_add2( MultiPlayer_1, id - DEVICE_JOY1 );
 }
 
 /*