Fixed #166
Amélioration #171