fixes #1666