Downgrade to use match not multi match