再次尝试修复 Issue #49