Fixing inheritance chain stuff again