Please create a pull request with a test case that reproduces your issue and your proposed fix.

Please see the org.hibernate.test.multitenancy tests for examples.