Now prevents duplicate matches