fixes #1740