Bug fix

Change-Id: Ia5cf247d2f978a6e504359701564bcd7f20126fb