Fix iterators context bug