fix Macro and Define