some fix

Change-Id: I071c0bbd545a184be222825b0d561d392741a7cf