Added to kill_list and fixes #3