Fix ticket https://redmine.i3s.unice.fr/issues/63