Fix controllers