Fixed broken equality comparisons