Fixed bugs

Change-Id: I53d42d49b149acb6f976545272cce433ad6811c7