fixed the macro calls