Fix for #4592.
Merge pull request #4593 from Segrain/master

Smallfix.