fixes #1871