diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt
index 3a8e0e6ed6..ffde2eaacb 100644
--- a/Docs/Changelog_sm-ssc.txt
+++ b/Docs/Changelog_sm-ssc.txt
@@ -10,9 +10,13 @@ supported but exist anyways.)
 _____________________________________________________________________________
 
 ================================================================================
-sm-ssc v1.2.3 | 2011022?
+sm-ssc v1.2.3 | 201103??
 --------------------------------------------------------------------------------
 
+20110302
+--------
+* [ScreenGameplaySyncMachine] Allow themes to use either .ssc or .sm files. [AJ]
+
 20110301
 --------
 * Allow Tickcount Segments to have a value of 0 to better replicate some
@@ -61,7 +65,6 @@ sm-ssc v1.2.3 | 2011022?
 * [ScreenEdit] Display the Player Number for Routine mode. [Wolfman2000]
 * [ScreenEdit] Add format string metrics for the right hand side of the editor.
   [Wolfman2000]
-* [ScreenGameplaySyncMachine] Allow themes to use either .ssc or .sm files. [AJ]
 
 20110221
 --------
diff --git a/src/ScreenGameplaySyncMachine.cpp b/src/ScreenGameplaySyncMachine.cpp
index 150d9c7b81..63895b18a9 100644
--- a/src/ScreenGameplaySyncMachine.cpp
+++ b/src/ScreenGameplaySyncMachine.cpp
@@ -21,15 +21,16 @@ void ScreenGameplaySyncMachine::Init()
 
 	RString sFile = THEME->GetPathO("ScreenGameplaySyncMachine","music");
 	// Allow themers to use .ssc and .sm files. -aj
-	bool bLoadedSSCFile = SSCLoader::LoadFromSSCFile( sFile, m_Song );
-	if( !bLoadedSSCFile )
+	if(sFile.Right(4) == ".ssc")
+		SSCLoader::LoadFromSSCFile( sFile, m_Song );
+	else
 		SMLoader::LoadFromSMFile( sFile, m_Song );
 
 	m_Song.SetSongDir( Dirname(sFile) );
 	m_Song.TidyUpData();
 
 	GAMESTATE->m_pCurSong.Set( &m_Song );
-	// needs proper StepsType - freem
+	// Needs proper StepsType -freem
 	vector<Steps*> vpSteps;
 	SongUtil::GetPlayableSteps( &m_Song, vpSteps );
 	ASSERT_M(vpSteps.size() > 0, "No playable steps for ScreenGameplaySyncMachine");