Fixed funnel algorithm. Fix feels like a hack.