Fixed widget-reloading issue