Fix always swaping players