Fix widgetset issue