fix for #1458