fix #1437
clean
Merge pull request #631 from jygaulier/3.8-fix1437

3.8 fix1437