Fixed .match()