diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 403f91688e..ac5c1f1b48 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -164,27 +164,20 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
 
 
 	// If solo-single is enabled..
-	if( PREFSMAN->m_bSoloSingle == true && GAMESTATE->GetCurrentStyleDef()->m_NotesType == STYLE_DANCE_SINGLE && GAMESTATE->GetNumSidesJoined() == 1 )
+	if( PREFSMAN->m_bSoloSingle && 
+		GAMESTATE->GetCurrentStyleDef()->m_NotesType == STYLE_DANCE_SINGLE &&
+		GAMESTATE->GetNumSidesJoined() == 1 &&
+		GAMESTATE->IsPlayerEnabled(0) )
 	{
-		int iJoinedSide;
-		for( unsigned u=0;u<NUM_PLAYERS;u++)
-			if( GAMESTATE->IsPlayerEnabled(u) == true )
-				iJoinedSide = u;
-		
-		
-		
-		if( iJoinedSide == 0 )
-		{
-			m_GhostArrowRow.SetX( 165 );
-			m_GrayArrowRow.SetX( 165 );
-			m_NoteField.SetX( 165 );
-			m_Combo.SetX( 165 );
-			for( c=0; c<pStyleDef->m_iColsPerPlayer; c++ )
-			{
-				m_HoldJudgment[c].SetX( (float)pStyleDef->m_ColumnInfo[pn][c].fXOffset + m_GhostArrowRow.GetX());
-			}
-			m_Judgment.SetX( 165 );
-		}
+		m_GhostArrowRow.SetX( 165 );
+		m_GrayArrowRow.SetX( 165 );
+		m_NoteField.SetX( 165 );
+		m_Combo.SetX( 165 );
+
+		for( c=0; c<pStyleDef->m_iColsPerPlayer; c++ )
+			m_HoldJudgment[c].SetX( (float)pStyleDef->m_ColumnInfo[pn][c].fXOffset + m_GhostArrowRow.GetX());
+
+		m_Judgment.SetX( 165 );
 	}