Fix collator issue