fix inconsistencies with new stream api vs old one