Fixed comparator handling