fix #10358
Merge pull request #177 from AgelxNash/master

fix #10358