Performance tweak

Change-Id: Ic38a8554d6feb5c92c88ff5383ec2123b6faceb3