diff --git a/src/ScreenMessage.cpp b/src/ScreenMessage.cpp
index 572f177055..ecdf7609f5 100644
--- a/src/ScreenMessage.cpp
+++ b/src/ScreenMessage.cpp
@@ -32,9 +32,9 @@ ScreenMessage ScreenMessageHelpers::ToScreenMessage( const RString &sName )
 
 RString	ScreenMessageHelpers::ScreenMessageToString( ScreenMessage SM )
 {
-	FOREACHM( RString, ScreenMessage, *m_pScreenMessages, it )
-		if( SM == it->second )
-			return (*it).first;
+	for (auto const & it : *m_pScreenMessages)
+		if( SM == it.second )
+			return it.first;
 
 	return RString();
 }