Added to kill list and fixes #3