Fix jaming the service