fixed player switching