controller and model fix