fix iterators