fixes #1646