修复部分bug
See merge request !75 (merged)
(cherry picked from commit d46efa88)
57efa020 修复部分bug
This will create a new commit in order to revert the existing changes.