fixing stream combinators