bug fix of controllers