diff --git a/stepmania/src/InputFilter.cpp b/stepmania/src/InputFilter.cpp
index 2f113bd2f2..d6a3aa8a09 100644
--- a/stepmania/src/InputFilter.cpp
+++ b/stepmania/src/InputFilter.cpp
@@ -153,13 +153,12 @@ void InputFilter::ResetDevice( InputDevice device )
 	LockMut(*queuemutex);
 	RageTimer now;
 
-	vector<DeviceInput> DeviceInputs;
-	GetPressedButtons( DeviceInputs );
-
-	FOREACH( DeviceInput, DeviceInputs, di )
+	const ButtonStateMap g_ButtonStates( g_ButtonStates );
+	FOREACHM_CONST( DeviceInput, ButtonState, g_ButtonStates, b )
 	{
-		if( di->device == device )
-			ButtonPressed( DeviceInput(device, di->button, -1, now), false );
+		const DeviceInput &di = b->first;
+		if( di.device == device )
+			ButtonPressed( DeviceInput(device, di.button, -1, now), false );
 	}
 }