new fixes for locators