Fix equality comparisons