Fix Aliasing

Change-Id: I7ca16ad9b60db635a14bb88b36d568dcf09397b1