entity inheritance fix