fixes #1851