partial fix for #1172