belt+suspenders for #664