Update according to Julien Brisset wise advices.