Fix in derived entities.