fix bugs


Change-Id: I02840a46919bd63c434ddbb480d80390f473c4fb