Fix for the random problems with saving widgets