Fixed a small bug in Streams/related tool