Fixing up the macro