fixes #1807