diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 80c7491412..ebcaa8d694 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -477,8 +477,7 @@ static vector<Song*> GetFilteredBestSongs( StepsType nt )
 	for( int j=vSongsByMostPlayed.size()-1; j>=0; j-- )
 	{
 		Song* pSong = vSongsByMostPlayed[j];
-		if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fLongVerSongSeconds  ||
-			pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds  || 
+		if( SONGMAN->GetNumStagesForSong(pSong) > 1 ||
 			!pSong->GetStepsByDifficulty(nt, DIFFICULTY_MEDIUM, PREFSMAN->m_bAutogenMissingTypes)  ||
 			!pSong->GetStepsByDifficulty(nt, DIFFICULTY_HARD, PREFSMAN->m_bAutogenMissingTypes) )
 			vSongsByMostPlayed.erase( vSongsByMostPlayed.begin()+j );