CHG: Compatibility with latest HEAsoft