Tighten up equality check