fix #1713
Merge pull request #1019 from jygaulier/3.8-fix1713

fix #1713