Deal correctly with legacies