fix on macros