diff --git a/stepmania/src/GhostArrowRow.cpp b/stepmania/src/GhostArrowRow.cpp
index 53596b129c..2e7394dfaf 100644
--- a/stepmania/src/GhostArrowRow.cpp
+++ b/stepmania/src/GhostArrowRow.cpp
@@ -27,7 +27,8 @@ void GhostArrowRow::Load( PlayerNumber pn, CString NoteSkin, float fYReverseOffs
 	// init arrows
 	for( int c=0; c<m_iNumCols; c++ ) 
 	{
-		CString Button = g_NoteFieldMode[m_PlayerNumber].GhostButtonNames[c];
+		NoteFieldMode &mode = g_NoteFieldMode[pn];
+		CString Button = mode.GhostButtonNames[c];
 		if(Button == "")
 			Button = NoteSkinManager::ColToButtonName(c);
 
diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp
index 70326ad7f2..bdea8b796e 100644
--- a/stepmania/src/NoteDisplay.cpp
+++ b/stepmania/src/NoteDisplay.cpp
@@ -130,7 +130,8 @@ void NoteDisplay::Load( int iColNum, PlayerNumber pn, CString NoteSkin, float fY
 	m_fYReverseOffsetPixels = fYReverseOffsetPixels;
 
 	/* Normally, this is empty and we use the style table entry via ColToButtonName. */
-	CString Button = g_NoteFieldMode[m_PlayerNumber].NoteButtonNames[iColNum];
+	NoteFieldMode &mode = g_NoteFieldMode[pn];
+	CString Button = mode.NoteButtonNames[iColNum];
 	if(Button == "")
 		Button = NoteSkinManager::ColToButtonName(iColNum);
 
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 7a906b0780..4dc7654150 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -204,7 +204,8 @@ void PlayerMinus::Load( PlayerNumber pn, const NoteData* pNoteData, LifeMeter* p
 	int c;
 	for( c=0; c<pStyleDef->m_iColsPerPlayer; c++ )
 	{
-		m_HoldJudgment[c].Command( g_NoteFieldMode[pn].m_HoldJudgmentCmd[c] );
+		NoteFieldMode &mode = g_NoteFieldMode[pn];
+		m_HoldJudgment[c].Command( mode.m_HoldJudgmentCmd[c] );
 	}
 
 	// Need to set Y positions of all these elements in Update since
diff --git a/stepmania/src/ReceptorArrow.cpp b/stepmania/src/ReceptorArrow.cpp
index 5316b49f16..6519eff3f7 100644
--- a/stepmania/src/ReceptorArrow.cpp
+++ b/stepmania/src/ReceptorArrow.cpp
@@ -20,7 +20,8 @@ bool ReceptorArrow::Load( CString NoteSkin, PlayerNumber pn, int iColNo )
 	m_PlayerNumber = pn;
 	m_iColNo = iColNo;
 
-	CString sButton = g_NoteFieldMode[pn].GrayButtonNames[iColNo];
+        NoteFieldMode &mode = g_NoteFieldMode[pn];
+	CString sButton = mode.GrayButtonNames[iColNo];
 	if( sButton == "" )
 		sButton = NoteSkinManager::ColToButtonName( iColNo );