diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 62912b58c3..2489704f47 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -537,7 +537,7 @@ bool ScreenGameplay::IsLastSong()
 			if( pCourse->m_bRepeat )
 				return false;
 			else
-                return GAMESTATE->GetCourseSongIndex() == (int)m_apCourseSongs.size();
+                return GAMESTATE->GetCourseSongIndex()+1 == (int)m_apCourseSongs.size(); // GetCourseSongIndex() is 0-based but size() is not
 		}
 		break;
 	default: