issue #160 - fixed funnel wrapper problem in fibers mode - need to review other modes