diff --git a/stepmania/src/InputFilter.cpp b/stepmania/src/InputFilter.cpp
index 4e7a2f2426..aa8c2abc3e 100644
--- a/stepmania/src/InputFilter.cpp
+++ b/stepmania/src/InputFilter.cpp
@@ -315,7 +315,7 @@ const T *FindItemBinarySearch( IT begin, IT end, const T &i )
 	return &*it;
 }
 
-bool InputFilter::IsBeingPressed( const DeviceInput &di, const DeviceInputList *pButtonState )
+bool InputFilter::IsBeingPressed( const DeviceInput &di, const DeviceInputList *pButtonState ) const
 {
 	LockMut(*queuemutex);
 	if( pButtonState == NULL )
@@ -324,7 +324,7 @@ bool InputFilter::IsBeingPressed( const DeviceInput &di, const DeviceInputList *
 	return pDI != NULL;
 }
 
-float InputFilter::GetSecsHeld( const DeviceInput &di, const DeviceInputList *pButtonState )
+float InputFilter::GetSecsHeld( const DeviceInput &di, const DeviceInputList *pButtonState ) const
 {
 	LockMut(*queuemutex);
 	if( pButtonState == NULL )
@@ -367,15 +367,7 @@ void InputFilter::FlushInputEvents()
 void InputFilter::GetPressedButtons( vector<DeviceInput> &array )
 {
 	LockMut(*queuemutex);
-	FOREACHM( DeviceInput, ButtonState, g_ButtonStates, b )
-	{
-		if( b->second.m_BeingHeld )
-		{
-			DeviceInput di = b->first;
-			di.level = b->second.m_Level;
-			array.push_back( di );
-		}
-	}
+	array = g_CurrentState;
 }
 
 /*
diff --git a/stepmania/src/InputFilter.h b/stepmania/src/InputFilter.h
index de35a2673b..d11704b5a1 100644
--- a/stepmania/src/InputFilter.h
+++ b/stepmania/src/InputFilter.h
@@ -56,8 +56,8 @@ public:
 	void ResetKeyRepeat( const DeviceInput &di );
 
 	// If aButtonState is NULL, use the last reported state.
-	bool IsBeingPressed( const DeviceInput &di, const DeviceInputList *pButtonState = NULL );
-	float GetSecsHeld( const DeviceInput &di, const DeviceInputList *pButtonState = NULL );
+	bool IsBeingPressed( const DeviceInput &di, const DeviceInputList *pButtonState = NULL ) const;
+	float GetSecsHeld( const DeviceInput &di, const DeviceInputList *pButtonState = NULL ) const;
 	RString GetButtonComment( const DeviceInput &di ) const;
 	
 	void GetInputEvents( vector<InputEvent> &aEventOut );