Fix issue with heir not being oldest living son.