Fix issue with condition when it was initially true