diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt
index c69c1ae8c4..d585f0c39c 100644
--- a/Docs/Changelog_sm-ssc.txt
+++ b/Docs/Changelog_sm-ssc.txt
@@ -17,6 +17,8 @@ sm-ssc v1.2.5 | 201104??
 --------
 * [CourseLoaderCRS] Fixed loading of Player's Best/Most Played courses,
   probably others too. [AJ]
+* [ScreenGameplaySyncMachine] Fixed a crash when entering
+  ScreenGameplaySyncMachine as Player 2. (Fixes issue 127) [AJ]
 
 20110422
 --------
diff --git a/src/ScreenGameplaySyncMachine.cpp b/src/ScreenGameplaySyncMachine.cpp
index 008bb31585..325b3a2e87 100644
--- a/src/ScreenGameplaySyncMachine.cpp
+++ b/src/ScreenGameplaySyncMachine.cpp
@@ -35,8 +35,7 @@ void ScreenGameplaySyncMachine::Init()
 	SongUtil::GetPlayableSteps( &m_Song, vpSteps );
 	ASSERT_M(vpSteps.size() > 0, "No playable steps for ScreenGameplaySyncMachine");
 	Steps *pSteps = vpSteps[0];
-	// TODO: Either detect which player accessed this file, or FOREACH all of them. -Wolfman2000
-	GAMESTATE->m_pCurSteps[0].Set( pSteps );
+	GAMESTATE->m_pCurSteps[GAMESTATE->GetFirstHumanPlayer()].Set( pSteps );
 
 	GamePreferences::m_AutoPlay.Set( PC_HUMAN );