Fix: Issue #1