fixes #1624