Fix comparisons (fixes rashed's logic)