Work-in-progress fix for compareTo