Fix service restarting