Resolve Issue #6