update Issue #7