Fixes #1783
Merge pull request #1784 from rgallion/Fix_Issue_1783

Fixes #1783