fixes #1799