fixup support for stream subscribe