Should be the last fix needed for anvils. (Famous last words)