diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 0d1556c013..da81e7000d 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -1012,10 +1012,10 @@ NoteType NoteData::GetSmallestNoteTypeForMeasure( int iMeasureIndex )
 
 void NoteData::PadTapNotes(int rows)
 {
-	int needed = rows - m_TapNotes[0].size();
+	int needed = rows - m_TapNotes[0].size() + 1;
 	if(needed < 0) return;
-	vector<TapNote> pad(needed+1, TAP_EMPTY);
-	for(int track = 0; track < MAX_NOTE_TRACKS; ++track)
+	vector<TapNote> pad(needed, TAP_EMPTY);
+	for(int track = 0; track < m_iNumTracks; ++track)
 		m_TapNotes[track].insert(m_TapNotes[track].end(), pad.begin(), pad.end());
 }