Infinite update fix