Players switching bug fix