fixed infinite update loop

Change-Id: I2f5e14780fcf30546ac670ccc589fd26f7749828