Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #388 from frankyifei/fix
fix #1852 and #1546
- Loading branch information
fix #1852 and #1546