(cherry-picked from 7d15b4d1f181de8868c375c545a51e4dfc28a611)

Fixes gh-1795
Closes gh-1893

Thanks for the report flexphperia!