Updated tombstone quick fix