diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 9d3c882b55..b3e222cdae 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -1205,9 +1205,9 @@ void Player::HandleStep( int col, const RageTimer &tm, bool bHeld )
 				);
 
 			// TODO: Remove use of PlayerNumber
-			PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
-
-			GAMESTATE->LaunchAttack( (MultiPlayer)OPPOSITE_PLAYER[pn], attack );
+			PlayerNumber pnToAttack = OPPOSITE_PLAYER[m_pPlayerState->m_PlayerNumber];
+			PlayerState *pPlayerStateToAttack = GAMESTATE->m_pPlayerState[pnToAttack];
+			pPlayerStateToAttack->LaunchAttack( attack );
 
 			// remove all TapAttacks on this row
 			for( int t=0; t<m_NoteData.GetNumTracks(); t++ )