Bugfix for collator