fix to kill-mode