Kill_list hotfix