Bug fix

Change-Id: If20c5cfb48cd26aa97f7cfb6cc73eb407e7873ef