diff --git a/stepmania/src/Style.cpp b/stepmania/src/Style.cpp
index 4ec2afb2f1..c8b9cea697 100644
--- a/stepmania/src/Style.cpp
+++ b/stepmania/src/Style.cpp
@@ -46,9 +46,11 @@ GameInput Style::StyleInputToGameInput( int iCol, PlayerNumber pn ) const
 		if( bUsingOneSide && gc != (int) pn )
 			continue;
 
-		for( int i = 0; i < INPUTMAPPER->GetInputScheme()->m_iButtonsPerController && m_iInputColumn[gc][i] != END_MAPPING; ++i )
-			if( m_iInputColumn[gc][i] == iCol )
+		for( int i = GAME_BUTTON_NEXT; i < INPUTMAPPER->GetInputScheme()->m_iButtonsPerController && m_iInputColumn[gc][i] != END_MAPPING; ++i )
+		{
+			if( m_iInputColumn[gc][i-GAME_BUTTON_NEXT] == iCol )
 				return GameInput( gc, i );
+		}
 	}
 
 	FAIL_M( ssprintf("Invalid column %i,%i", pn, iCol) );