Fix aliasing error correctly

Change-Id: I27dd9726abd9327c6eeb9e34ce18050b36fc1938