fix the macdema issue