diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 579208e303..937fd20014 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -990,7 +990,7 @@ void ScreenGameplay::SetupSong( int iSongIndex )
 		}
 
 		/* Update attack bOn flags. */
-		GAMESTATE->Update(0);
+		pi->GetPlayerState()->Update(0);
 		pi->GetPlayerState()->RebuildPlayerOptionsFromActiveAttacks();
 
 		/* Hack: Course modifiers that are set to start immediately shouldn't tween on. */