Fixed a problem with Heritage.