Merge pull request #2701 from dawgfoto/fix11237

fix Issue 11237