Fixed bug with switch_player