fix/Issue #9