Please attach a test case that reproduces your test case. Templates are at https://github.com/hibernate/hibernate-test-case-templates.

Or, since you have a proposed fix, it would be great if you could create a pull request with a test case and your fix.