fix issue #2

New PR, including comments made on the previous one.

A ta dispo pour d'autres ajustements. Bonne journée.