Fix aliasing

Change-Id: I19282035ba0e8893d9379a7168cef1223512100a