This should not be removed, the locator should be changed