Fixed bug with undefining macros