diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index ee57d1bdf9..6d5b493002 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -187,7 +187,7 @@ void NoteData::CopyRange( NoteData* pFrom, int iFromIndexBegin, int iFromIndexEn
 	// copy recorded TapNotes
 	int f = iFromIndexBegin, t = iToIndexBegin;
 	
-	while( f<=iFromIndexEnd && f < MAX_TAP_NOTE_ROWS )
+	while( f<=iFromIndexEnd && f < MAX_TAP_NOTE_ROWS && t < MAX_TAP_NOTE_ROWS )
 	{
 		for( int c=0; c<m_iNumTracks; c++ )
 			m_TapNotes[c][t] = pFrom->m_TapNotes[c][f];