Fix data propagation between widgets