Strengthen fingerprint parsing