Regression fix, widgets