Fixed for new Fibers API