[~] fixed iterators bugs