Fixed problem with widgets