Second place where the same code is used
Use type-safe comparisons