OC-6037: Fix missing iteration