fix controller
Merge branch 'hotfix/fix_admin2'

* hotfix/fix_admin2:
  fix controller