diff --git a/src/Course.cpp b/src/Course.cpp
index 75d32fce14..66a79a6edf 100644
--- a/src/Course.cpp
+++ b/src/Course.cpp
@@ -798,9 +798,9 @@ void Course::RegenerateNonFixedTrails() const
 	if( AllSongsAreFixed() )
 		return;
 
-	FOREACHM( CacheEntry, CacheData, m_TrailCache, e )
+	for (auto const & e: m_TrailCache)
 	{
-		const CacheEntry &ce = e->first;
+		const CacheEntry &ce = e.first;
 		GetTrailForceRegenCache( ce.first, ce.second );
 	}
 }