resolve Issue #8