widget hotfix
Merge branch 'hotfix/widget-hotfix'