Better locator logic.