修复#4 issus