Fixes #1810