diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp
index a578e75d2b..1c34f9d525 100644
--- a/stepmania/src/OptionRowHandler.cpp
+++ b/stepmania/src/OptionRowHandler.cpp
@@ -158,14 +158,14 @@ public:
 	}
 	void ImportOption( const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const
 	{
-		int iFallbackOption = -1;
-		bool bUseFallbackOption = true;
-
 		FOREACH_CONST( PlayerNumber, vpns, pn )
 		{
 			PlayerNumber p = *pn;
 			vector<bool> &vbSelOut = vbSelectedOut[p];
 
+			int iFallbackOption = -1;
+			bool bUseFallbackOption = true;
+
 			for( unsigned e = 0; e < m_aListEntries.size(); ++e )
 			{
 				const GameCommand &mc = m_aListEntries[e];