diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index d163d3c448..80c4751654 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -847,6 +847,9 @@ void Player::Step( int col, const RageTimer &tm )
 				m_pNoteField->DidTapNote( col, score, false );
 		}
 
+		if( m_pPlayerState->m_PlayerController == PC_HUMAN && score >= TNS_GREAT ) 
+			HandleAutosync( fNoteOffset );
+
 		// Do game-specific score mapping.
 		score = GAMESTATE->GetCurrentGame()->MapTapNoteScore( score );
 
@@ -859,9 +862,6 @@ void Player::Step( int col, const RageTimer &tm )
 				m_pPlayerStageStats->iTotalError += ms_error;
 		}
 
-		if( m_pPlayerState->m_PlayerController == PC_HUMAN && score >= TNS_GREAT ) 
-			HandleAutosync( fNoteOffset );
-
 		if( score == TNS_MARVELOUS && !GAMESTATE->ShowMarvelous() )
 			score = TNS_PERFECT;