Resolved Issue #1