Re: [A] Preserve hooks locality