fixed map and for macros