better fingerprint handling