preventing infinite update loop

Change-Id: I0bbc4c6cc37dca33409651575f8c46ce8eeceb29