[FIX] Iteration on not required fields fixed.