Fix aliasing