Fix inheritence