fixed else if