Fixed stream encription

This is the part I missed when I was implementing new streams. Mostly because it
wasn't covered by specs.

Fixes #484