Workaround for widgets problem