issue #227 - fixed to handle optimized fibers calls