Fix heritage