Re: [Dev] Autolocator fix