BACKLOG-3860 : fixed iterator position