Regression fix c69ac64
Merge pull request #4502 from raven02/patch-16

Regression fix c69ac64