Correct context in each iterator