wip
Fix non-termination of stream in non-limited case