Resolved Issue #3