Fix due to the modified WsStream.cs