diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index a597780459..b0ba9f00b6 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -210,9 +210,10 @@ RageColor GameState::GetStageColor()
 int GameState::GetCourseSongIndex()
 {
 	int iSongIndex = 0;
+	/* iSongsPlayed includes the current song, so it's 1-based; subtract one. */
 	for( int p=0; p<NUM_PLAYERS; p++ )
 		if( IsPlayerEnabled(p) )
-			iSongIndex = max( iSongIndex, m_CurStageStats.iSongsPlayed[p] );
+			iSongIndex = max( iSongIndex, m_CurStageStats.iSongsPlayed[p]-1 );
 	return iSongIndex;
 }