Fix: Issue 1 - connection failed/restored now more reliable