commit by xfwduke@mac