diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 13feecb0d8..8b8b9a67f7 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -51,6 +51,13 @@ void NoteData::ClearRange( int iNoteIndexBegin, int iNoteIndexEnd )
 	this->Convert4sToHoldNotes();
 }
 
+void NoteData::ClearAll()
+{
+	for( int t=0; t<m_iNumTracks; t++ )
+		m_TapNotes[t].clear();
+	m_HoldNotes.clear();
+}
+
 /* Copy a range from pFrom to this.  (Note that this does *not* overlay;
  * all data in the range is overwritten.) */
 void NoteData::CopyRange( NoteData* pFrom, int iFromIndexBegin, int iFromIndexEnd, int iToIndexBegin )
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index d68253e5f6..14996a11a7 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -63,7 +63,7 @@ public:
 	void SetTapNote(int track, int row, TapNote t);
 
 	void ClearRange( int iNoteIndexBegin, int iNoteIndexEnd );
-	void ClearAll() { ClearRange( 0, MAX_TAP_NOTE_ROWS ); };
+	void ClearAll();
 	void CopyRange( NoteData* pFrom, int iFromIndexBegin, int iFromIndexEnd, int iToIndexBegin = -1 );
 	void CopyAll( NoteData* pFrom );