Further optimization

Change-Id: Iec185fbc770f3e04958c353a38cc0cc98c92fc29