Iteration looks wrong here #3408