Fixed the buffering of incoming data