- Was also reported on the mailing list and the issue tracker (with a patch), but also clean up the logic for that section too.