Fix Issue 1827
Merge pull request #1828 from datguy/Issue1827

Fix for #1827. Thanks!