fix use of incorrect macros