Fixed hibernate related issue