Iteration fix