enhance Issue #3