some fix

Change-Id: Ie8d5732da146ecc40d0781ae65418559ed62d8c1