Fix the controller