Fix: Issue #16