Fix the widget issue (fix #50)