Fixed: Issue #12