Another fix in the service