fixes #1860