fix bugs

Change-Id: I877bb4169112371d2e57860b198d395bf135dc46