Adding check for match