Fix Comparator