Iterator bugfix