diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 5f8f6b29fe..202918c711 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -2182,11 +2182,11 @@ void ScreenGameplay::Input( const InputEventPlus &input )
 	}
 	
 	bool bRelease = input.type == IET_RELEASE;
-	const int iCol = GAMESTATE->GetCurrentStyle()->GameInputToColumn( input.GameI );
-
-	if( iCol == Column_Invalid )
+	if( !input.GameI.IsValid() )
 		return;
 	
+	const int iCol = GAMESTATE->GetCurrentStyle()->GameInputToColumn( input.GameI );
+
 	// Don't pass on any inputs to Player that aren't a press or a release.
 	switch( input.type )
 	{