model, controller has been fixed.