r655: Fix if() logic