diff --git a/src/GameManager.cpp b/src/GameManager.cpp
index c38ded3673..447bea964a 100644
--- a/src/GameManager.cpp
+++ b/src/GameManager.cpp
@@ -333,7 +333,7 @@ static const Style g_Style_Dance_Couple_Edit =
 	"couple",			// m_szName
 	StepsType_dance_couple,	// m_StepsType
 	StyleType_OnePlayerOneSide,		// m_StyleType
-	4,				// m_iColsPerPlayer
+	8,				// m_iColsPerPlayer
 	{	// m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
 		{	// PLAYER_1
 			{ TRACK_1,	-DANCE_COL_SPACING*4.f, NULL },
@@ -357,8 +357,8 @@ static const Style g_Style_Dance_Couple_Edit =
 		},
 	},
 	{	// m_iInputColumn[NUM_GameController][NUM_GameButton]
-		{ 0, 3, 2, 1, Style::END_MAPPING },
-		{ 4, 5, 6, 7, Style::END_MAPPING }
+		{ 0, 1, 2, 3, 4, 5, 6, 7, Style::END_MAPPING },
+		{ 0, 1, 2, 3, 4, 5, 6, 7, Style::END_MAPPING },
 	},
 	{	// m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
 		0,1,2,3,4,5,6,7
diff --git a/src/NoteField.cpp b/src/NoteField.cpp
index 2d23b62889..e97ca24225 100644
--- a/src/NoteField.cpp
+++ b/src/NoteField.cpp
@@ -211,10 +211,10 @@ void NoteField::Load(
 
 	//int i1 = m_pNoteData->GetNumTracks();
 	//int i2 = GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer;
-
-	ASSERT_M( m_pNoteData->GetNumTracks() == GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer, 
-		ssprintf("NumTracks %d = ColsPerPlayer %d",m_pNoteData->GetNumTracks(), GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer) );
-
+	ASSERT_M(m_pNoteData->GetNumTracks() == GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer, 
+		 ssprintf("NumTracks %d = ColsPerPlayer %d",m_pNoteData->GetNumTracks(), 
+			  GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer));
+	
 	// The NoteSkin may have changed at the beginning of a new course song.
 	RString sNoteSkinLower = m_pPlayerState->m_PlayerOptions.GetCurrent().m_sNoteSkin;
 
@@ -1162,7 +1162,9 @@ void NoteField::DrawPrimitives()
 	float fSelectedRangeGlow = SCALE( RageFastCos(RageTimer::GetTimeSinceStartFast()*2), -1, 1, 0.1f, 0.3f );
 
 	const Style* pStyle = GAMESTATE->GetCurrentStyle();
-	ASSERT( GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer == m_pNoteData->GetNumTracks() );
+	ASSERT_M(m_pNoteData->GetNumTracks() == GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer, 
+		 ssprintf("NumTracks %d = ColsPerPlayer %d",m_pNoteData->GetNumTracks(), 
+			  GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer));
 
 	for( int i=0; i<m_pNoteData->GetNumTracks(); i++ )	// for each arrow column
 	{