Fixed the comparators