Further optimization

Change-Id: I4c0f51aa957296522c504a8b3503b09320c8359b