actually fix aliasing violations