bugs 1 and 2 with streaming API