Improve #53 impl for Hibernate3 as well