Fix funnel object cross-pollution