fixes #1625