fixes #1758