partial fix for #3020