fixing #define MAS_SHORTHAND