added a workaround to make stream work for demo purpose