diff --git a/src/ThemeMetric.h b/src/ThemeMetric.h
index a4073ffa1a..d953128453 100644
--- a/src/ThemeMetric.h
+++ b/src/ThemeMetric.h
@@ -267,8 +267,8 @@ public:
 	void Load( const RString& sGroup, MetricNameMap pfn, const vector<RString> vsValueNames )
 	{
 		m_metric.clear();
-		FOREACH_CONST( RString, vsValueNames, s )
-			m_metric[*s].Load( sGroup, pfn(*s) );
+		for (RString const &s : vsValueNames)
+			m_metric[s].Load( sGroup, pfn(s) );
 	}
 	void Read()
 	{