Merge pull request #2979 from pulpe/streamcz_fix