修得Issue #18