fixes #1678