Fix MACRO insertions