Fix aliasing

Change-Id: Ib78e3a9c0ab1f34dd0df1be8265b09367e21a106