Please attach a runnable test case. Test templates can be found at https://github.com/hibernate/hibernate-test-case-templates.

Since rugarciap has located the offending code, it would be even better to create a pull request with a test that reproduces the issue and the fix.