Fixed comparisons; this time I think for good.