Fixe issues #26