Further optimization

Change-Id: I2a30bf3765d869e103ced85e2bf94414aeaccfdd