Add hotfix to prevent task-of-death.