fix new macros