Better handling of fingerprint