update Issue #6