Bug fix for the service.