fix macros hygiene