diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index c91eecd1ef..1ffb9a43b0 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -1509,8 +1509,7 @@ void NoteDataUtil::FixImpossibleRows( NoteData &inout, StepsType st )
 		return;
 
 	// each row must pass at least one valid mask
-	int iLastRow = inout.GetLastRow();
-	for( int r=0; r<=iLastRow; r++ )
+	FOREACH_NONEMPTY_ROW_ALL_TRACKS( inout, r )
 	{
 		// only check rows with jumps
 		if( inout.GetNumTapNonEmptyTracks(r) < 2 )