fixes #1735