Make message matcher more robust