fix for macros issue