fix yield bug