fixes #1706