[DF-3871] Fixed for iteration bug