Fix another issue with Result_Stream branch of TB