Fixing inheritance