Fix #4913
Merge pull request #4934 from raven02/patch-28

Fix pull request #4913