CHG: MacOSX compatibility