Fixed implementation of matchToken!