Changes by Rémi (not sure that it works...)