Fix re-connection