fix #1150
Merge pull request #436 from jygaulier/master-fix1150

[3.8] fix #1150