Further optimization

Change-Id: I95f0421f138ad57ffd5bb8cccf2c455b04e2add6