Basic anti-tampering support for #9