fixes #1639