[fix] make it work for modified-iterators