11093 fix
Merge pull request #497 from hflynn/11093

11093 fix