Fix base controller class