Fix bug with iterators
Fix bug with iterator