Fix #3186
Merge pull request #3342 from LaurentGoderre/master

Fix #3186