Fix for changed stream-buffer api