Fixe issue #8