Fix for issue #5036
Merge pull request #5160 from darylprickett/issue_5036

Fix for issue #5036