Fixed: Issue #11