Merge pull request #1312 from dawgfoto/fix10017

fix issue 10017