Fixes #4810
Merge pull request #4990 from Zuhayr/master

Fixes #4810