Fixed stale iterations issue.