Fix if else re-use