Reproduce issue 1846
Fix for #1846
Merge pull request #1848 from ghartnett/fix1846

Fix1846