Fix: Issue #2