Fixes #1859