Fixed graveyard issue