Hibernate fix