修复 issue #20