fixes #1861