Better bugfix for else if