fixing macros