fix map iterators