fixed breaking change in macros