some fix

Change-Id: I00534a11abaa9f81d4f2b4da4554fd3d5c2f4a2b