fix #32956: Possible fix for Mac
Merge pull request #1347 from Igevorse/bugs

fix #32956: Possible fix for Mac