fix:fix two bug
Merge pull request #5559 from samuele3hu/masterFix

fix two bug