fixed aliasing issues