Bug fix

Change-Id: I1ae283c1625e6a83a4baebec5371443790251525