partial fix for #1354