diff --git a/src/servers/input/InputServer.cpp b/src/servers/input/InputServer.cpp
index 38fb3e2c68..8a5df951ee 100644
--- a/src/servers/input/InputServer.cpp
+++ b/src/servers/input/InputServer.cpp
@@ -1272,14 +1272,14 @@ InputServer::FilterEvents(BList *eventsToFilter)
 	if (NULL == eventsToFilter)
 		return false;
 	
-	BInputServerFilter* current_filter;
-	BMessage*           current_event;
+	BInputServerFilter *current_filter;
 	int32               filter_index  = 0;
-	int32               event_index   = 0;
 
 	while (NULL != (current_filter = (BInputServerFilter*)gInputFilterList.ItemAt(filter_index) ) ) {
 		// Apply the current filter to all available event messages.
 		//		
+		int32 event_index = 0;
+		BMessage *current_event;
 		while (NULL != (current_event = (BMessage*)eventsToFilter->ItemAt(event_index) ) ) {
 			// Storage for new event messages generated by the filter.
 			//