Hibernate Fix