Fixed iterators bug