Fix for Comparable