Fixed major issue with the way macros were nested