I added a new commit trying to replicate your issue, but I couldn't. Check out [my commit](https://github.com/hibernate/hibernate-orm/commit/d9e5edc9c0268c25d780c78d97a7c918b1b6a9ae), and adjust it so that you can replicate the issue. If you can;t replicate it, I'll close the Jira issue.