diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 4734169078..a2bd69a0b0 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -103,11 +103,14 @@ void NoteData::Config( const NoteData &From )
 	m_iNumTracks = From.m_iNumTracks;
 }
 
-void NoteData::CopyAll( NoteData* pFrom )
+void NoteData::CopyAll( const NoteData* pFrom )
 {
 	Config(*pFrom);
 	ClearAll();
-	CopyRange( pFrom, 0, pFrom->GetLastRow() );
+
+	for( int c=0; c<m_iNumTracks; c++ )
+		m_TapNotes[c] = pFrom->m_TapNotes[c];
+	m_HoldNotes = pFrom->m_HoldNotes;
 }
 
 void NoteData::AddHoldNote( HoldNote add )
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index 3de7f7e1f8..42624b0f2c 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -58,7 +58,7 @@ public:
 	void ClearRange( int iNoteIndexBegin, int iNoteIndexEnd );
 	void ClearAll();
 	void CopyRange( NoteData* pFrom, int iFromIndexBegin, int iFromIndexEnd, int iToIndexBegin = -1 );
-	void CopyAll( NoteData* pFrom );
+	void CopyAll( const NoteData* pFrom );
 	
 	inline bool IsRowEmpty( int index ) const
 	{