Fix for fiber yield bug