Added check for a valid fingerprint when matching