fix the service and client type