Further optimization

Change-Id: I603c79b45160f06e966b9732a9046f568b9611e3