More related bug fixing with reconnection