fixes #1821