Fix tombstone