Fix for Service Locator :)