Added fix for service manager.