Modified matcher to produce better results