fixes #1707