Fixed inheritance handling.