Fix inheritence issue