Another fix for issue #1758