Repaired bug in macros defines