diff --git a/stepmania/src/LightsManager.cpp b/stepmania/src/LightsManager.cpp
index 06476d5f54..f01c46deec 100644
--- a/stepmania/src/LightsManager.cpp
+++ b/stepmania/src/LightsManager.cpp
@@ -426,7 +426,11 @@ void LightsManager::ChangeTestCabinetLight( int iDir )
 	m_iControllerTestManualCycleCurrent = -1;
 
 	m_clTestManualCycleCurrent = (CabinetLight)(m_clTestManualCycleCurrent+iDir);
-	wrap( (int&)m_clTestManualCycleCurrent, NUM_CabinetLight );
+	{
+		int temp = m_clTestManualCycleCurrent;
+		wrap( temp, NUM_CabinetLight );
+		m_clTestManualCycleCurrent = CabinetLight( temp );
+	}
 }
 
 void LightsManager::ChangeTestGameButtonLight( int iDir )