fixes #1656