partial fix for #3