Add fix for inline comparator