work on #1758