Revert comparisons for some cases, Fix #25