Another aliasing lazy fix

Change-Id: I81f99502375eef418d360a72f6e07b37810ba91b