Fixed tombstones again