fixed map iterator