fix map iterator