Hardening/fix tombstone bug