fixes #1681