HSEARCH-1558

Hopefully works across all OS types now...