Fixed issue with restarting from timeout/stalled clients