Fixing advection extraction