fixes #1711