fix issue
Merge branch 'hotfix/controller_fix'