Equality mismatch fix