tweak matcher to handle crazy case