Could we use a stronger locator here?