Stream buffering fixed