diff --git a/stepmania/src/LightsManager.cpp b/stepmania/src/LightsManager.cpp
index d25b508826..b882459114 100644
--- a/stepmania/src/LightsManager.cpp
+++ b/stepmania/src/LightsManager.cpp
@@ -137,7 +137,7 @@ void LightsManager::Update( float fDeltaTime )
 	{
 	case LIGHTSMODE_JOINING:
 		{
-//			int iBeat = (int)(GAMESTATE->m_fSongBeat);
+//			int iBeat = (int)(GAMESTATE->m_fLightSongBeat);
 //			bool bBlinkOn = (iBeat%2)==0;
 
 			FOREACH_PlayerNumber( pn )
@@ -175,7 +175,7 @@ void LightsManager::Update( float fDeltaTime )
 			FOREACH_CabinetLight( cl )
 				m_LightsState.m_bCabinetLights[cl] = false;
 
-			int iBeat = (int)(GAMESTATE->m_fSongBeat);
+			int iBeat = (int)(GAMESTATE->m_fLightSongBeat);
 			int iTopIndex = iBeat;
 			wrap( iTopIndex, 4 );
 			switch( iTopIndex )
@@ -238,7 +238,7 @@ void LightsManager::Update( float fDeltaTime )
 	// If not joined, has enough credits, and not too late to join, then 
 	// blink the menu buttons rapidly so they'll press Start
 	{
-		int iBeat = (int)(GAMESTATE->m_fSongBeat*4);
+		int iBeat = (int)(GAMESTATE->m_fLightSongBeat*4);
 		bool bBlinkOn = (iBeat%2)==0;
 		FOREACH_PlayerNumber( pn )
 		{
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 19e2069a42..26fcb32ae3 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1650,8 +1650,7 @@ void ScreenGameplay::UpdateLights()
 	ZERO( bBlinkGameButton );
 	bool bCrossedABeat = false;
 	{
-		float fPositionSeconds = GAMESTATE->m_fMusicSeconds + g_fLightsAheadSeconds;	// trigger the light a tiny bit early
-		float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds );
+		const float fSongBeat = GAMESTATE->m_fLightSongBeat;
 		const int iSongRow = BeatToNoteRowNotRounded( fSongBeat );
 
 		static int iRowLastCrossed = 0;