Fix hibernate issue