diff --git a/src/arch/InputHandler/InputHandler.cpp b/src/arch/InputHandler/InputHandler.cpp
index c8eca4eb26..b4839c9205 100644
--- a/src/arch/InputHandler/InputHandler.cpp
+++ b/src/arch/InputHandler/InputHandler.cpp
@@ -176,12 +176,12 @@ void InputHandler::Create( const RString &drivers_, vector<InputHandler *> &Add
 	if( DriversToTry.empty() )
 		RageException::Throw( "%s", INPUT_HANDLERS_EMPTY.GetValue().c_str() );
 	
-	FOREACH_CONST( RString, DriversToTry, s )
+	for (RString const &s : DriversToTry)
 	{
-		RageDriver *pDriver = InputHandler::m_pDriverList.Create( *s );
+		RageDriver *pDriver = InputHandler::m_pDriverList.Create( s );
 		if( pDriver == NULL )
 		{
-			LOG->Trace( "Unknown Input Handler name: %s", s->c_str() );
+			LOG->Trace( "Unknown Input Handler name: %s", s.c_str() );
 			continue;
 		}