Fixes Issue #5116
Merge pull request #5125 from zafe/master

Fixes Issue #5116