Contribute to the kill list and fixes #3