small bug fix in Controller
small bug fixes in Controller