Further optimization

Change-Id: I369c54f2194ba8fc13e4d6651d84181fefbc82d6