Macro conversion fix