avoiding infinite update loop

Change-Id: I2506861e56f295066caa14c1d1f52d87373509bc