Inheritence fix