CHG: Mac compatibility