Minor change to iterator