Reluctantly keep stream workaround but fix bug