Fix stream instance retrieval