diff --git a/src/ArrowEffects.cpp b/src/ArrowEffects.cpp
index 9e96ee8111..3fe128a777 100644
--- a/src/ArrowEffects.cpp
+++ b/src/ArrowEffects.cpp
@@ -255,9 +255,11 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float
 	SpeedSegment &seg = pCurSteps->m_Timing.GetSpeedSegmentAtBeat( fSongBeat );
 	if( seg.m_fPercent != 1 )
 	{
-		if( fSongBeat + seg.m_fWait <= fNoteBeat )
+		float fStartBeat = NoteRowToBeat(seg.m_iStartRow);
+		
+		if( fStartBeat + seg.m_fWait >= fSongBeat )
 		{
-			float fBeatsUsed = fSongBeat - NoteRowToBeat(seg.m_iStartRow);
+			float fBeatsUsed = fSongBeat - fStartBeat;
 			float fRatioUsed = fBeatsUsed / seg.m_fWait;
 			
 			float fDistance = 1 - seg.m_fPercent;