First fix for #16106
Merge pull request #16226 from thatch45/2014.7

First fix for #16106