Fixing aliasing issues