Fix Aliasing

Change-Id: Icdc231f59ea5a2d8404384be0c27fe5e33b26a50