fixed inheritance issues