fix commented "never" issue - add else if