Fixed: Issue #9