Further optimization

Change-Id: I2f65e3162b787f73a0fe6fb809ad8dc89ac72af8