Hibernate fixed