Excessive reconnects issue resolution

Fixes #868