Fixed JPA support