Fixed extra controllers