Shutdown on_stop, helps wih #117