What exactly do you want to work around, this issue or the one you linked to in https://hibernate.atlassian.net/browse/HHH-16868?focusedCommentId=112362 ? If the latter, i think the comment should probably go in there?