Bug fix in controller
Bug fix