Organize reconnection problem a bit