potential macro conflict fix