Fixup mac