Fix: Issue #7