Fixes #1834
Fixes #1848