Another programmer grievance in the kill list. fixes #3