修复ISSUE #12 #19