diff --git a/stepmania/src/NotesWriterDWI.cpp b/stepmania/src/NotesWriterDWI.cpp
index 175bb0dc6f..8b17668241 100644
--- a/stepmania/src/NotesWriterDWI.cpp
+++ b/stepmania/src/NotesWriterDWI.cpp
@@ -399,20 +399,22 @@ bool NotesWriterDWI::Write( CString sPath, const Song &out )
 		f.PutLine( ";" );
 	}
 
-	for( unsigned i=0; i<out.m_vpSteps.size(); i++ ) 
+	const vector<Steps*>& vpSteps = out.GetAllSteps();
+	for( unsigned i=0; i<vpSteps.size(); i++ ) 
 	{
-		if( out.m_vpSteps[i]->IsAutogen() )
+		const Steps* pSteps = vpSteps[i];
+		if( pSteps->IsAutogen() )
 			continue;	// don't save autogen notes
 
-		if(!WriteDWINotesTag( f, *out.m_vpSteps[i] ))
+		if( !WriteDWINotesTag( f, *pSteps ))
 			continue;
 
-		WriteDWINotesField( f, *out.m_vpSteps[i], 0 );
-		if(out.m_vpSteps[i]->m_StepsType==STEPS_TYPE_DANCE_DOUBLE ||
-		   out.m_vpSteps[i]->m_StepsType==STEPS_TYPE_DANCE_COUPLE)
+		WriteDWINotesField( f, *pSteps, 0 );
+		if( pSteps->m_StepsType==STEPS_TYPE_DANCE_DOUBLE ||
+		    pSteps->m_StepsType==STEPS_TYPE_DANCE_COUPLE )
 		{
 			f.PutLine( ":" );
-			WriteDWINotesField( f, *out.m_vpSteps[i], 4 );
+			WriteDWINotesField( f, *pSteps, 4 );
 		}
 
 		f.PutLine( ";" );
diff --git a/stepmania/src/NotesWriterSM.cpp b/stepmania/src/NotesWriterSM.cpp
index 7b022e21ff..57c1fb8730 100644
--- a/stepmania/src/NotesWriterSM.cpp
+++ b/stepmania/src/NotesWriterSM.cpp
@@ -205,9 +205,10 @@ bool NotesWriterSM::Write(CString sPath, const Song &out, bool bSavingCache)
 	//
 	// Save all Steps for this file
 	//
-	for( i=0; i<out.m_vpSteps.size(); i++ ) 
+	const vector<Steps*>& vpSteps = out.GetAllSteps();
+	for( i=0; i<vpSteps.size(); i++ ) 
 	{
-		Steps* pSteps = out.m_vpSteps[i];
+		const Steps* pSteps = vpSteps[i];
 		if( pSteps->IsAutogen() )
 			continue; /* don't write autogen notes */
 
@@ -215,7 +216,7 @@ bool NotesWriterSM::Write(CString sPath, const Song &out, bool bSavingCache)
 		if( pSteps->WasLoadedFromProfile() )
 			continue;
 
-		WriteSMNotesTag( *out.m_vpSteps[i], f, bSavingCache );
+		WriteSMNotesTag( *pSteps, f, bSavingCache );
 	}
 
 	return true;