Resolved Issue #348