Streams mapping fix