Fixing Streaming API