fix #1210
fix #1210
Merge pull request #438 from jygaulier/master-fix1210

[3.8] Master fix1210