fix automatic resolved object + TODO if connexion is lost