Fix fingerprint handling