Change else if => if after return, after r203265