Fixes #1813