also fix duplicated Macro class