Fix controller regression (again)