Thanks to @TheDistantSea for the report!

Fixes gh-1790
Closes gh-1643
(cherry picked from commit bc1cb122db30be034b3da84ee2546c86e2a5268f)