fix collate errors