fixes #1680