Fixing the stream types ...