More aggressive kill-on-stop