Fix Macro issue