Merge pull request #5113 from colemanw/Fix