diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 340ca95e0c..9c4ac9c277 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -210,7 +210,7 @@ void Song::GetBeatAndBPSFromElapsedTime( float fElapsedTime, float &fBeatOut, fl
 		}
 
 
-		if( fElapsedTime > fSecondsInThisSegment )
+		if( !bIsLastBPMSegment && fElapsedTime > fSecondsInThisSegment )
 		{
 			// this BPMSegement is NOT the current segment
 			fElapsedTime -= fSecondsInThisSegment;