Code fix

Change-Id: I0dd22df04561a727cb259110ad00d9c39744dcbb