diff --git a/stepmania/src/InputFilter.cpp b/stepmania/src/InputFilter.cpp
index bb5109bc0b..12219b8ed6 100644
--- a/stepmania/src/InputFilter.cpp
+++ b/stepmania/src/InputFilter.cpp
@@ -199,8 +199,8 @@ void InputFilter::ReportButtonChange( const DeviceInput &di, InputEventType t )
 	 * g_ButtonStates will be in DeviceInput order, so users can binary search this
 	 * list (eg. std::lower_bound).
 	 */
-	MakeButtonStateList( ie.m_ButtonState );
-	g_CurrentState = ie.m_ButtonState;
+	MakeButtonStateList( g_CurrentState );
+	ie.m_ButtonState = g_CurrentState;
 }
 
 void InputFilter::MakeButtonStateList( vector<DeviceInput> &aInputOut ) const