Fix map iterator