Fix for macros