Fix an issue with player join/quit