Hi @dfreismuth , the patch which we created can be found here: https://github.com/hibernate/hibernate-search/commit/434aabb0d7fe50bbf2049b1de96a4d7ea94eeff5

You could check the project out, and edit the patch to your liking. I tried several variations but couldn't get it to fail; if you could change it to reproduce the issue, please let us know we'll fix it!