LPS-48992 Fix iteration