Hsearch 1252

Hi, this fixes https://hibernate.onjira.com/browse/HSEARCH-1252