Fixed incorrect comparators