diff --git a/stepmania/src/AutoKeysounds.cpp b/stepmania/src/AutoKeysounds.cpp
index acb0447b01..fbb434d14c 100644
--- a/stepmania/src/AutoKeysounds.cpp
+++ b/stepmania/src/AutoKeysounds.cpp
@@ -46,7 +46,7 @@ void AutoKeysounds::FinishLoading()
 	int iNumTracks = m_ndAutoKeysoundsOnly[GAMESTATE->m_MasterPlayerNumber].GetNumTracks();
 	for( int t = 0; t < iNumTracks; t++ )
 	{
-		int iRow = 0;
+		int iRow = -1;
 		while(1)
 		{
 			/* Find the next row that either player has a note on. */
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index 763bc50164..09bf6ed35c 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -9,13 +9,13 @@
 #include "Attack.h"
 
 #define FOREACH_NONEMPTY_ROW_IN_TRACK( nd, track, row ) \
-	for( int row = 0; (nd).GetNextTapNoteRowForTrack(track,row); )
+	for( int row = -1; (nd).GetNextTapNoteRowForTrack(track,row); )
 #define FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE( nd, track, row, start, last ) \
 	for( int row = start-1; (nd).GetNextTapNoteRowForTrack(track,row) && row <= (last); )
 #define FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE_REVERSE( nd, track, row, start, last ) \
 	for( int row = last+1; (nd).GetPrevTapNoteRowForTrack(track,row) && row >= (start); )
 #define FOREACH_NONEMPTY_ROW_ALL_TRACKS( nd, row ) \
-	for( int row = 0; (nd).GetNextTapNoteRowForAllTracks(row); )
+	for( int row = -1; (nd).GetNextTapNoteRowForAllTracks(row); )
 #define FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( nd, row, start, last ) \
 	for( int row = start-1; (nd).GetNextTapNoteRowForAllTracks(row) && row <= (last); )