fixed comparisons ... again