ui/controller bug fix