Fix for JPA entities