Still trying to make 26467 bulletproof.