Fix issue with getting more data out the socket than we need