added check for inherited data