diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 62813398f3..5bdfdf1749 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -359,6 +359,7 @@ void PlayerMinus::Update( float fDeltaTime )
 
 		float fStartBeat, fEndBeat;
 		mod.GetAttackBeats( GAMESTATE->m_pCurSong, m_PlayerNumber, fStartBeat, fEndBeat );
+		fEndBeat = min( fEndBeat, GetMaxBeat() );
 
 		LOG->Trace( "Applying transform '%s' from %f to %f to '%s'", mod.sModifier.c_str(), fStartBeat, fEndBeat,
 			GAMESTATE->m_pCurSong->GetTranslitMainTitle().c_str() );