update Issue #2