fix iterator