Merge pull request #1857 from dawgfoto/fix9866

fix9866