Fix service locator