Fix incompatible macros issue