Completely fix reconnection