fixing player switching