Fixed Collection iterator behaviour