fix #1954
Merge pull request #2088 from archangel-irk/3.8.x

fix #1954