Fix to make it really stream this time.