i made a PR applying the solution used in OGM https://github.com/hibernate/hibernate-orm/pull/1086