Fixed JPA again