Don't invalidate iterators again!