Made a fix for the service