Fix #9752
Merge pull request #74 from elpaso/master

Fix #9752