Make check for Stream backwards compatible

Ref #4