Fixing the StreamShipper....