Fixed service-locator version