(unstable) [fixed] infinite loop

Change-Id: I15fd214492c92af5a6a68538c08a59f4c98dbe0c