Take kill_on_stop here too.