fixed MAcros