Fixing segmented iterator