fix type of iterators