Fix until player number selection is in lobby screen