fixes #1694