Hi Craig Chapman, I've added PR https://github.com/hibernate/hibernate-orm/pull/3171. If time permits and you can; would you be able to build that into master and let me know if that fixes your issue as I couldn't see any side effects once I made this fix.