bug fix widget
Merge origin/master