maybe fix for #1758