Issue #91 en Issue #97