Fix bug for Guillaume