fixes #1808