Regression fix: streaming problems 2

Signed-off-by: Rafał Malinowski <rafal.malinowski@corp.bluecherry.net>