...it never stops

Change-Id: Ifa170b0ef2c2a0c4ebb44743b83ec24d3e7db112