diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 338d83d4cb..05f4f55c58 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -237,12 +237,10 @@ int NoteData::GetNumTapNotes( const float fStartBeat, const float fEndBeat ) con
 	int iNumNotes = 0;
 	int iStartIndex = BeatToNoteRow( fStartBeat );
 	int iEndIndex = BeatToNoteRow( fEndBeat );
-	if(fEndBeat == MAX_BEATS)
-		iEndIndex = min(iEndIndex, int(m_TapNotes[0].size()));
 
 	for( int t=0; t<m_iNumTracks; t++ )
 	{
-		for( int i=iStartIndex; i<iEndIndex; i++ )
+		for( int i=iStartIndex; i<=iEndIndex; i++ )
 		{
 			if( GetTapNote(t, i) != TAP_EMPTY )
 				iNumNotes++;