修复Issue #20