Same fix than Fix #75