What about QuerySplitter implementation? I think it has the same issue. It even have been reported in HHH-11588 Open .