bug fix - macros work now