fixed stream2 impl