Resolved Issue #243