fix some error

fix some error
Merge pull request #6868 from liyoro/master

fix some error