fix broken iterators