Fixed compareTo