Regression fix #4837
Merge pull request #4840 from raven02/patch-12

Regression fix #4837