diff --git a/src/NoteData.cpp b/src/NoteData.cpp
index 3cfbcd239a..96429530a0 100644
--- a/src/NoteData.cpp
+++ b/src/NoteData.cpp
@@ -501,8 +501,13 @@ int NoteData::GetNumTapNotes( int iStartIndex, int iEndIndex ) const
 
 int NoteData::GetNumTapNotesInRow( int iRow ) const
 {
-	// Optimization opportunity: There's no need to instantiate row iterators if we're only checking one row.
-	return GetNumTapNotes( iRow, iRow+1 );
+	int iNumNotes = 0;
+	for( int t=0; t<GetNumTracks(); t++ )
+	{
+		if (this->IsTap(GetTapNote(t, iRow), iRow))
+			iNumNotes++;
+	}
+	return iNumNotes;
 }
 
 int NoteData::GetNumRowsWithTap( int iStartIndex, int iEndIndex ) const