fixing tombstones