fix for #1376