#123: little improvement for hibernate support