main tombstone fix