Fixe for issue #66