Fixed: Issue #8