fixes client socket timeout issue #1435