Further optimization

Change-Id: I6993db729bcbc87a59dacce5eeaf06bc491cfe9c