More correct fix based on collection mapping information