Finally fix comparison counting?