Resolved Issue #6