I agree with the suggested fix.
PR: https://github.com/hibernate/hibernate-orm/pull/1761
Thanks for the report and the test case!