Merge pull request #4760 from colemanw/settingFix