the fixing of hmatch() continues...