I'll echo the re-pair in place advice. I'll also defer to the two more-knowledgeable people ahead of me, but I will note that I had the same issue, and once I got it working, it has been rock solid since.
This is what I wrote in a different topic:
