Fixed ForeignEntityCollection problems