potential fix for #1758