Fix new controller