WIP macro
Fix macro problem