FIxes some collation bugs.
Bugfix for the bugfix