fixes #1659