Fixed aliasing issues