Hibernate regression fix