Fixed extra else 2