Changed #define to allow full support for macro definition