fix to allow re-use of locators