Corrected if () handling, step 2