fix widgets creation