Fixes #1758