fixes #1715