More bug fix

Change-Id: I858fe4df374130daf3d2831880a4aa2d1ca728d2