Address issue #1758