diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index a40465d7cf..52bbaf9b90 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -93,7 +93,7 @@ void NoteDataUtil::LoadFromSMNoteDataString( NoteData &out, CString sSMNoteData
 
 			const char *p = sMeasureLine;
 			int iTrack = 0;
-			while( *p )
+			while( iTrack < iNumTracks && *p )
 			{
 				TapNote tn;
 				char ch = *p;