ServiceLocator code correction