Fix: cyclic updates