Aliasing again

Change-Id: Ia30a28fe3cd89921c8dd7a8f7fc745e28da21733