fixed else if statements