Gábor Varga I was finally able to use the sample you provided to create a proper test case that reproduces the issue. With the test case and with the awesome analysis you did, I came up with a fix not much different than what you suggested. PR: https://github.com/hibernate/hibernate-orm/pull/1461