Fixing the macros