fixes #1730