Fix for potential desync on ms_join