修复bug
bug3
bug5
bug6