EZP-22210: Fixed locator algorithm