Fix for #3552.
Merge pull request #3556 from Segrain/master

Smallfix.