probably-correct fix for #952