Another fix for the reconnect-logic