Fixed macros replace