minor change on macros