Patch attached.

There are cases when previously decoded substreams
would, if they have overlapping channels with final substream, cause
incorrect decoding results.