Reorder to catch elseif() correctly (Probably doesn't break anything else :D)