Fixed JPA entities