fix the controller