diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 00b24c46bb..0fb82963a7 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -779,8 +779,14 @@ void Course::RegenerateNonFixedTrails() const
 	// We can create these Trails on demand because we don't 
 	// calculate RadarValues for Trails with one or more non-fixed 
 	// entry.
-	if( !AllSongsAreFixed() )
-		m_TrailCache.clear();
+	if( AllSongsAreFixed() )
+		return;
+
+	FOREACHM( CacheEntry, CacheData, m_TrailCache, e )
+	{
+		const CacheEntry &ce = e->first;
+		GetTrailForceRegenCache( ce.first, ce.second );
+	}
 }
 
 RageColor Course::GetColor() const