Fix wrong player is selected if no player is given