Fix for stability of widget tree