diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp
index 1b0ae65848..a484732b12 100644
--- a/stepmania/src/NoteDataWithScoring.cpp
+++ b/stepmania/src/NoteDataWithScoring.cpp
@@ -114,7 +114,7 @@ int GetSuccessfulHands( const NoteData &in, int iStartIndex = 0, int iEndIndex =
 			int iHeadRow;
 			if( !in.IsHoldNoteAtBeat( t, i, &iHeadRow ) )
 				continue;
-			const TapNote &tn = in.GetTapNote(t, i);
+			const TapNote &tn = in.GetTapNote( t, iHeadRow );
 
 			/* If a hold is released *after* a hands containing it, the hands is
 			 * still good.  So, ignore the judgement and only examine iLastHeldRow