fix for passing parameters to macros