NOTE: kill code changed (fixed?) in v1.6009. Might have fixed this issue.