Fixed inheritance handling