diff --git a/stepmania/src/ModeChoice.cpp b/stepmania/src/ModeChoice.cpp
index 9d2cc7a863..b440211a44 100644
--- a/stepmania/src/ModeChoice.cpp
+++ b/stepmania/src/ModeChoice.cpp
@@ -100,7 +100,8 @@ void ModeChoice::Load( int iIndex, CString sChoice )
 		split( sCommand, ",", asBits );
 		
 		CString sName = asBits[0];
-		CString sValue = (asBits.size()>1) ? asBits[1] : "";
+		asBits.erase(asBits.begin(), asBits.begin()+1);
+		CString sValue = join( ",", asBits );
 
 		sName.MakeLower();
 		sValue.MakeLower();