Fixed the macros