Fix in controller