diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp
index a220cf65a7..5806541f69 100644
--- a/stepmania/src/OptionRowHandler.cpp
+++ b/stepmania/src/OptionRowHandler.cpp
@@ -81,7 +81,6 @@ public:
 		ASSERT( command.m_vsArgs.size() == 2 );
 		ASSERT( sParam.size() );
 
-		Init();
 		defOut.Init();
 
 		if(		 sParam.CompareNoCase("NoteSkins")==0 )		{ FillNoteSkins( defOut, sParam );		return; }
@@ -898,7 +897,6 @@ public:
 		ASSERT( command.m_vsArgs.size() == 2 );
 		ASSERT( sParam.size() );
 
-		Init();
 		defOut.Init();
 
 		if( sParam == "EditStepsType" )
@@ -1000,7 +998,6 @@ public:
 		ASSERT( command.m_vsArgs.size() == 2 );
 		ASSERT( sParam.size() );
 
-		Init();
 		defOut.Init();
 
 		if( sParam == "EditSteps" )
@@ -1151,7 +1148,6 @@ public:
 	{
 		ASSERT( cmds.v.size() > 1 );
 
-		Init();
 		defOut.Init();
 
 		Commands temp = cmds;
diff --git a/stepmania/src/OptionRowHandler.h b/stepmania/src/OptionRowHandler.h
index 99b68c6c65..c9c66b71d3 100644
--- a/stepmania/src/OptionRowHandler.h
+++ b/stepmania/src/OptionRowHandler.h
@@ -25,6 +25,7 @@ public:
 	}
 	virtual void Load( OptionRowDefinition &defOut, const Commands &cmds )
 	{
+		Init();
 		m_cmds = cmds;
 		this->LoadInternal( defOut, cmds );
 	}