Fix this bug

Change-Id: I2e8a21dc00cc6700ff47e10b9c1903c6ede1ce96