Fixed (via a hack) the reconnect issue