fix bugs

Change-Id: Ieab756ed43259cbd49be69319d095fee1f1bd115