fixes #1647