/kind bug

Which issue(s) this PR fixes:

Fixes #I1EU81:Bug in cleaning the iterators