#690. Implemented a workaround for the tcp bug.