update Issue #43
update Issue #43