aliasing fix

Change-Id: I4ab040e06dc43a064fdfb2ee386b7beee7b9432d