partial fix for #163