additional fix for #1758