Lazy work around for aliasing violations

Change-Id: I08cd6f0bca9d2228dcac22a2a678a13069ac12f5