Iterators fix.