Long bug fixing

Funny ... it took five years to fix this issue in hibernate.